[Avida-cvs] [avida-svn] r745 - in development: consistencytests/Tests/SMT support/utils/AvidaUtils

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-06-09 16:07:35 -0400 (Fri, 09 Jun 2006)
New Revision: 745

Modified:
   development/consistencytests/Tests/SMT/SConscript
   development/support/utils/AvidaUtils/TestUtil.py
Log:

Some consistency tests under SCons were limited to one seed while I was
working on the Windows testing system. This commit restores full
consistency tests.



Modified: development/consistencytests/Tests/SMT/SConscript
===================================================================
--- development/consistencytests/Tests/SMT/SConscript	2006-06-09 19:46:38 UTC (rev 744)
+++ development/consistencytests/Tests/SMT/SConscript	2006-06-09 20:07:35 UTC (rev 745)
@@ -26,7 +26,7 @@
 
 RunLength = '500'
 TestDirBase = e.Dir('Seed_')
-SeedSet = range(100,101)
+SeedSet = range(100,105)
 OutputFileName = 'detail_pop.%s' % RunLength
 
 ConsistencyCheck(e, 'Default-SMT',

Modified: development/support/utils/AvidaUtils/TestUtil.py
===================================================================
--- development/support/utils/AvidaUtils/TestUtil.py	2006-06-09 19:46:38 UTC (rev 744)
+++ development/support/utils/AvidaUtils/TestUtil.py	2006-06-09 20:07:35 UTC (rev 745)
@@ -82,8 +82,6 @@
 
     expected_last_line_fd = file(expectation_file_path, "rU")
 
-    #os.system(avida_command)
-
     avida_output_fd = os.popen(avida_command, 'r', -1)
     line = avida_output_fd.readline()
     while line != "":
@@ -91,7 +89,6 @@
       line = avida_output_fd.readline()
     avida_output_fd.close()
 
-
     detail_fd = file(os.path.join(run_subdir, self.output_file_name),"rU") 
     next_detail_line = detail_fd.readline()
     while next_detail_line != "":
@@ -196,7 +193,12 @@
 
     expected_last_line_fd = file(expectation_file_path, "wU")
 
-    os.system(avida_command)
+    avida_output_fd = os.popen(avida_command, 'r', -1)
+    line = avida_output_fd.readline()
+    while line != "":
+      print line,
+      line = avida_output_fd.readline()
+    avida_output_fd.close()
 
     detail_fd = file(os.path.join(run_subdir, self.output_file_name),"rU")
     next_detail_line = detail_fd.readline()