[Avida-cvs] [avida-svn] r833 - in development/consistencytests/Tests: Default SMT

[avidaedward@myxo.css.msu.edu]

Author: avidaedward
Date: 2006-07-14 13:11:11 -0400 (Fri, 14 Jul 2006)
New Revision: 833

Modified:
   development/consistencytests/Tests/Default/CMakeLists.txt
   development/consistencytests/Tests/Default/SConscript
   development/consistencytests/Tests/SMT/CMakeLists.txt
   development/consistencytests/Tests/SMT/SConscript
Log:

Added short versions of consistency tests; these check a single seed.
Call with
   './test_avida --verbose -R Consistency-Check--Fast--Default-CPU'
and
   './test_avida --verbose -R Consistency-Check--Fast--Default-SMT'



Modified: development/consistencytests/Tests/Default/CMakeLists.txt
===================================================================
--- development/consistencytests/Tests/Default/CMakeLists.txt	2006-07-14 02:53:31 UTC (rev 832)
+++ development/consistencytests/Tests/Default/CMakeLists.txt	2006-07-14 17:11:11 UTC (rev 833)
@@ -82,5 +82,17 @@
 # to reduce the chance of inadvertently clobbering existing consistency-check suites.
 #
 
+
+# Fast version of test, checking only first seed.
+SET(SeedSet "range(100,101)")
+
+SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in") 
+SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/fast_check_tails.py") 
+CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
+
+IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+  ADD_TEST("Consistency-Check--Fast--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
+ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+
 # Vim modeline to tell Vim that this is a configuration script.
 # vim: set ft=config:

Modified: development/consistencytests/Tests/Default/SConscript
===================================================================
--- development/consistencytests/Tests/Default/SConscript	2006-07-14 02:53:31 UTC (rev 832)
+++ development/consistencytests/Tests/Default/SConscript	2006-07-14 17:11:11 UTC (rev 833)
@@ -40,5 +40,16 @@
   avida_args = AvidaArgs,
 )
 
+ConsistencyCheck(e, 'Fast--Default-CPU',
+  run_length = RunLength,
+  seed_set = SeedSet[0:1],
+  run_subdir_path_base = TestDirBase.path,
+  output_file_name = OutputFileName,
+  expectation_file_path_base = TestDirBase.srcnode().path,
+  expectation_file_name = '%s.expected_last_line' % OutputFileName,
+  avida_exe_path = avida_exe[0].path,
+  avida_args = AvidaArgs,
+)
 
+
 # vim: set ft=python:

Modified: development/consistencytests/Tests/SMT/CMakeLists.txt
===================================================================
--- development/consistencytests/Tests/SMT/CMakeLists.txt	2006-07-14 02:53:31 UTC (rev 832)
+++ development/consistencytests/Tests/SMT/CMakeLists.txt	2006-07-14 17:11:11 UTC (rev 833)
@@ -82,5 +82,17 @@
 # to reduce the chance of inadvertently clobbering existing consistency-check suites.
 #
 
+
+# Fast version of test, checking only first seed.
+SET(SeedSet "range(100,101)")
+
+SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in") 
+SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/fast_check_tails.py") 
+CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
+
+IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+  ADD_TEST("Consistency-Check--Fast--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
+ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
+
 # Vim modeline to tell Vim that this is a configuration script.
 # vim: set ft=config:

Modified: development/consistencytests/Tests/SMT/SConscript
===================================================================
--- development/consistencytests/Tests/SMT/SConscript	2006-07-14 02:53:31 UTC (rev 832)
+++ development/consistencytests/Tests/SMT/SConscript	2006-07-14 17:11:11 UTC (rev 833)
@@ -40,5 +40,16 @@
   avida_args = AvidaArgs,
 )
 
+ConsistencyCheck(e, 'Fast--Default-SMT',
+  run_length = RunLength,
+  seed_set = SeedSet[0:1],
+  run_subdir_path_base = TestDirBase.path,
+  output_file_name = OutputFileName,
+  expectation_file_path_base = TestDirBase.srcnode().path,
+  expectation_file_name = '%s.expected_last_line' % OutputFileName,
+  avida_exe_path = avida_exe[0].path,
+  avida_args = AvidaArgs,
+)
 
+
 # vim: set ft=python: