nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
gamnit: resize in dynamic resolution
[nit.git]
/
src
/
testing
/
testing_doc.nit
diff --git
a/src/testing/testing_doc.nit
b/src/testing/testing_doc.nit
index
1cdd10a
..
a17c8ab
100644
(file)
--- a/
src/testing/testing_doc.nit
+++ b/
src/testing/testing_doc.nit
@@
-197,7
+197,7
@@
class NitUnitExecutor
toolcontext.info("Execute doc-unit {du.full_name} in {file} {i}", 1)
var clock = new Clock
var res2 = toolcontext.safe_exec("{file.to_program_name}.bin {i} >'{file}.out1' 2>&1 </dev/null")
toolcontext.info("Execute doc-unit {du.full_name} in {file} {i}", 1)
var clock = new Clock
var res2 = toolcontext.safe_exec("{file.to_program_name}.bin {i} >'{file}.out1' 2>&1 </dev/null")
- du.real_time = clock.total
+ if not toolcontext.opt_no_time.value then du.real_time = clock.total
du.was_exec = true
var content = "{file}.out1".to_path.read_all
du.was_exec = true
var content = "{file}.out1".to_path.read_all
@@
-230,7
+230,7
@@
class NitUnitExecutor
if res == 0 then
var clock = new Clock
res2 = toolcontext.safe_exec("{file.to_program_name}.bin >'{file}.out1' 2>&1 </dev/null")
if res == 0 then
var clock = new Clock
res2 = toolcontext.safe_exec("{file.to_program_name}.bin >'{file}.out1' 2>&1 </dev/null")
- du.real_time = clock.total
+ if not toolcontext.opt_no_time.value then du.real_time = clock.total
du.was_exec = true
end
du.was_exec = true
end
@@
-263,7
+263,7
@@
class NitUnitExecutor
f.write("# GENERATED FILE\n")
f.write("# Docunits extracted from comments\n")
if mmodule != null then
f.write("# GENERATED FILE\n")
f.write("# Docunits extracted from comments\n")
if mmodule != null then
- f.write("import {mmodule.name}\n")
+ f.write("intrude import {mmodule.name}\n")
end
f.write("\n")
return f
end
f.write("\n")
return f
@@
-524,7
+524,7
@@
redef class ModelBuilder
var ndoc = nclassdef.n_doc
if ndoc != null then
doc_entities += 1
var ndoc = nclassdef.n_doc
if ndoc != null then
doc_entities += 1
- d2m.extract(ndoc.to_mdoc, "nitunit." + mmodule.full_name + "." + mclassdef.mclass.full_name, "<class>")
+ d2m.extract(ndoc.to_mdoc, "nitunit." + mclassdef.full_name.replace("$", "."), "<class>")
end
end
for npropdef in nclassdef.n_propdefs do
end
end
for npropdef in nclassdef.n_propdefs do
@@
-534,7
+534,8
@@
redef class ModelBuilder
var ndoc = npropdef.n_doc
if ndoc != null then
doc_entities += 1
var ndoc = npropdef.n_doc
if ndoc != null then
doc_entities += 1
- d2m.extract(ndoc.to_mdoc, "nitunit." + mmodule.full_name + "." + mclassdef.mclass.full_name, mpropdef.mproperty.full_name)
+ var a = mpropdef.full_name.split("$")
+ d2m.extract(ndoc.to_mdoc, "nitunit." + a[0] + "." + a[1], a[2])
end
end
end
end
end
end
@@
-566,7
+567,7
@@
redef class ModelBuilder
doc_entities += 1
# NOTE: jenkins expects a '.' in the classname attr
doc_entities += 1
# NOTE: jenkins expects a '.' in the classname attr
- d2m.extract(mdoc, "nitunit." + mgroup.full_name, "<group>")
+ d2m.extract(mdoc, "nitunit." + mgroup.mpackage.name + "." + mgroup.name + ".<group>", "<group>")
d2m.run_tests
d2m.run_tests