[Avida-SVN] [avida-svn] r1037 - in trunk/consistencytests/Tests/Researchers: dule dule/LocalSex goingssh goingssh/Kazi

Wed Oct 11 16:49:20 PDT 2006

Author: avidaedward
Date: 2006-10-11 19:49:20 -0400 (Wed, 11 Oct 2006)
New Revision: 1037

Modified:
   trunk/consistencytests/Tests/Researchers/dule/CMakeLists.txt
   trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
   trunk/consistencytests/Tests/Researchers/goingssh/CMakeLists.txt
   trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt
Log:

Disabled Dule's and Sherri's consistency tests on this branch ; they're
out of date.



Modified: trunk/consistencytests/Tests/Researchers/dule/CMakeLists.txt
===================================================================

--- trunk/consistencytests/Tests/Researchers/dule/CMakeLists.txt	2006-10-11 23:46:04 UTC (rev 1036)
+++ trunk/consistencytests/Tests/Researchers/dule/CMakeLists.txt	2006-10-11 23:49:20 UTC (rev 1037)
@@ -1,2 +1,2 @@
-SUBDIRS(LocalSex)
+#SUBDIRS(LocalSex)
 #SUBDIRS(LocalSex modularity)

Modified: trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt	2006-10-11 23:46:04 UTC (rev 1036)
+++ trunk/consistencytests/Tests/Researchers/dule/LocalSex/CMakeLists.txt	2006-10-11 23:49:20 UTC (rev 1037)
@@ -8,102 +8,60 @@
 # i.e., .../build/Tests/Researchers/dule/LocalSex/.
 #
 
-SET(TestsName "dule--GlobalSex")
+SET(TestsName "dule--GlobalASex")
 
 #
 # Avida configuration
 #
+
+# Number of updates per test
+SET(RunLength "500")
+
 SET(ConfigDir "${CMAKE_CURRENT_SOURCE_DIR}/config")
 SET(GenesisFile "${ConfigDir}/genesis")
-SET(InstSetFile "${ConfigDir}/inst_set.sex")
+SET(InstSetFile "${ConfigDir}/inst_set.asex")
 SET(EventFile "${ConfigDir}/events.cfg")
 SET(EnvironmentFile "${ConfigDir}/environment.cfg")
-SET(StartCreatureFile "${ConfigDir}/organism.100.sex")
-SET(AvidaArgs "-seed %d -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set BIRTH_METHOD 4")
+SET(StartCreatureFile "${ConfigDir}/creature.final.asex")
+SET(AvidaArgs "-c ${GenesisFile} -seed %d -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set BIRTH_METHOD 4 -set DATA_DIR .")
 
 #
 # Consistency checks configuration
 #
 
+SET(TestDirBaseName "GlobalAsex")
 # This is Python list of Avida random seeds.
 # E.g., "range(100,105)" is equivalent to the Python list "[100,101,102,103,104]".
 # I.e., SET(SeedSet "range(100,105)") is equivalent to SET(SeedSet "[100,101,102,103,104]").
 SET(SeedSet "range(100,105)")
-# Avida will be run in, and store output files in, ${CMAKE_CURRENT_BINARY_DIR}/Test_100, and so on.
-SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/GlobalSex_")
-# I've written ${ConfigDir}/events.cfg to stop Avida after 500 updates,
-# and to output a single detail-population file "detail_pop.500" per run,
-# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Test_100/detail_pop.500, and so on.
-SET(OutputFileName "detail_pop.500")
+SET(OutputFileName "detail_pop.${RunLength}")
 # Similar to above, except that this tells the testing scripts where to find
-# expected last lines of detail_pop.500 files,
-# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Test_100/detail_pop.500.expected_last_line, and so on.
-SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/GlobalSex_")
-SET(ExpectationFileName "detail_pop.500.expected_last_line")
+# expected last lines of detail_pop.${RunLength} files,
+# i.e., ${CMAKE_CURRENT_SOURCE_DIR}/Seed_100/detail_pop.500.expected_last_line, and so on.
+SET(ExpectationFileName "detail_pop.${RunLength}.expected_last_line")
+# Avida will be run in, and store output files in,
+# ${CMAKE_CURRENT_BINARY_DIR}/Seed_100, and so on.
+SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/${TestDirBaseName}_")
+SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/${TestDirBaseName}_")
 
 #
 # This generates the Python script that performs consistency checks.
 # Several of the variables defined above make their ways into the script.
 # See CMake's documentaton of the CONFIGURE_FILE command for details.
-
-SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in") 
-SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/sex_check_tails.py") 
+SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in")
+SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/check_tails.py")
 CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
 
 IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
-  #ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
+  ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
 ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
 
 #
-# Generation of expected last lines of detail_pop.500 files.
+# Generation of expected last lines of detail_pop files.
 #
-# To trigger this script, use commands like the following :
-#   $ pushd ${CMAKE_CURRENT_BINARY_DIR} # i.e., cd .../build/Tests/Researchers/dule/LocalSex/
-#   $ tar cvfz Tests.tgz `find . -name detail_pop.500.expected_last_line`
-#   $ cd ${CMAKE_CURRENT_SOURCE_DIR}
-#   $ tar xvfz ${CMAKE_CURRENT_BINARY_DIR}/Tests.tgz
-#   $ popd
-#
-# I think it's safer to require that these steps be performed by hand in order
-# to reduce the chance of inadvertently clobbering existing consistency-check suites.
-#
-SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in") 
-SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/sex_generate_tails.py") 
+SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in")
+SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/generate_tails.py")
 CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
 
-
-#
-# Reconfigure for GlobalAsex
-#
-
-SET(TestsName "dule--GlobalAsex")
-
-SET(ConfigDir "${CMAKE_CURRENT_SOURCE_DIR}/config")
-SET(GenesisFile "${ConfigDir}/genesis")
-SET(InstSetFile "${ConfigDir}/inst_set.asex")
-SET(EventFile "${ConfigDir}/events.cfg")
-SET(EnvironmentFile "${ConfigDir}/environment.cfg")
-#SET(StartCreatureFile "${ConfigDir}/organism.500.asex")
-SET(StartCreatureFile "${ConfigDir}/creature.final.asex")
-SET(AvidaArgs "-seed %d -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set BIRTH_METHOD 4")
-
-SET(SeedSet "range(100,105)")
-SET(RunSubdirPathBase "${CMAKE_CURRENT_BINARY_DIR}/GlobalAsex_")
-SET(OutputFileName "detail_pop.500")
-SET(ExpectationFilePathBase "${CMAKE_CURRENT_SOURCE_DIR}/GlobalAsex_")
-SET(ExpectationFileName "detail_pop.500.expected_last_line")
-
-SET(CheckTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/check_tails.py.in") 
-SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/asex_check_tails.py") 
-CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
-
-IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
-  ADD_TEST("Consistency-Check--${TestsName}" "${_PythonExePath}" "${CheckTailsScript}")
-ENDIF(AVD_CONSISTENCY_TEST_PRIMITIVE)
-
-SET(GenerateTailsScriptTemplate "${PROJECT_SOURCE_DIR}/CMakeModules/Templates/generate_tails.py.in") 
-SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/asex_generate_tails.py") 
-CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
-
 # Vim modeline to tell Vim that this is a configuration script.
 # vim: set ft=config:

Modified: trunk/consistencytests/Tests/Researchers/goingssh/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/CMakeLists.txt	2006-10-11 23:46:04 UTC (rev 1036)
+++ trunk/consistencytests/Tests/Researchers/goingssh/CMakeLists.txt	2006-10-11 23:49:20 UTC (rev 1037)
@@ -1 +1 @@
-SUBDIRS(Kazi)
+#SUBDIRS(Kazi)

Modified: trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt	2006-10-11 23:46:04 UTC (rev 1036)
+++ trunk/consistencytests/Tests/Researchers/goingssh/Kazi/CMakeLists.txt	2006-10-11 23:49:20 UTC (rev 1037)
@@ -29,7 +29,7 @@
 SET(EnvironmentFile "${ConfigDir}/environment.cfg")
 SET(StartCreatureFile "${ConfigDir}/kazi.org")
 # Command-line arguments passed to Avida.
-SET(AvidaArgs "-seed %d -set WORLD-X 40 -set WORLD-Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile}")
+SET(AvidaArgs "-c ${GenesisFile} -seed %d -set WORLD-X 40 -set WORLD-Y 40 -set INST_SET ${InstSetFile} -set EVENT_FILE ${EventFile} -set ENVIRONMENT_FILE ${EnvironmentFile} -set START_CREATURE ${StartCreatureFile} -set DATA_DIR .")
 
 #
 # Consistency checks configuration


