nitlanguage
/
nit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge: Sys is top
[nit.git]
/
contrib
/
nitester
/
src
/
nitester.nit
diff --git
a/contrib/nitester/src/nitester.nit
b/contrib/nitester/src/nitester.nit
index
1df1e3e
..
fb51b4d
100644
(file)
--- a/
contrib/nitester/src/nitester.nit
+++ b/
contrib/nitester/src/nitester.nit
@@
-131,7
+131,6
@@
abstract class Processor
else
full_path.file_delete
end
else
full_path.file_delete
end
- stat.free
end
mpi.finalize
exit 0
end
mpi.finalize
exit 0
@@
-180,15
+179,14
@@
abstract class Processor
var skip_path = "tests/turing.skip"
var skip
if skip_path.file_exists then
var skip_path = "tests/turing.skip"
var skip
if skip_path.file_exists then
- var skip_file = new IFStream.open(skip_path)
+ var skip_file = new FileReader.open(skip_path)
skip = skip_file.read_lines
skip_file.close
else
skip = new Array[String]
end
skip = skip_file.read_lines
skip_file.close
else
skip = new Array[String]
end
- for prog in test_programs do for engine in engines do
-
+ for engine in engines do for prog in test_programs do
# Is is blacklisted?
for s in skip do if not s.is_empty and prog.has(s) then
if verbose > 0 and rank == 0 then print "Skipping test '{prog}' because of '{s}' in turing.skip"
# Is is blacklisted?
for s in skip do if not s.is_empty and prog.has(s) then
if verbose > 0 and rank == 0 then print "Skipping test '{prog}' because of '{s}' in turing.skip"
@@
-303,7
+301,7
@@
class Controller
mpi.recv_empty(status.source, status.tag, comm_world)
at_work.remove(status.source)
mpi.recv_empty(status.source, status.tag, comm_world)
at_work.remove(status.source)
- if verbose > 1 then print "worker {status.source} is done ({at_work.length} still at work)"
+ if verbose > 0 then print "Worker {status.source} is done ({at_work.length} still at work)"
else
print "Unexpected tag {status.tag}"
shutdown
else
print "Unexpected tag {status.tag}"
shutdown
@@
-464,7
+462,7
@@
class Worker
sys.system cmd
# Test results were written to file, read them
sys.system cmd
# Test results were written to file, read them
- var fstream = new IFStream.open(tests_sh_out)
+ var fstream = new FileReader.open(tests_sh_out)
var content = fstream.read_all
fstream.close
var content = fstream.read_all
fstream.close
@@
-519,6
+517,8
@@
class Worker
end
end
end
end
+ if verbose > 1 then print "Done testing: {task}"
+
self.results_count = c
end
self.results_count = c
end
@@
-548,7
+548,7
@@
class Worker
fun send_results
do
if results_count > 0 then
fun send_results
do
if results_count > 0 then
- if verbose > 1 then print "sending {results_count} results"
+ if verbose > 2 then print "Sending {results_count} results"
mpi.send_from(buffer, 0, results_count*4, controller_rank, result_tag, comm_world)
results_count = 0
end
mpi.send_from(buffer, 0, results_count*4, controller_rank, result_tag, comm_world)
results_count = 0
end