[Avida-cvs] [avida-svn] r518 - in trunk: . consistencytests/Tests/Default

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-03-13 23:54:58 -0500 (Mon, 13 Mar 2006)
New Revision: 518

Added:
   trunk/consistencytests/Tests/Default/Seed_100/
   trunk/consistencytests/Tests/Default/Seed_101/
   trunk/consistencytests/Tests/Default/Seed_102/
   trunk/consistencytests/Tests/Default/Seed_103/
   trunk/consistencytests/Tests/Default/Seed_104/
   trunk/test_avida
Removed:
   trunk/consistencytests/Tests/Default/Default_100/
   trunk/consistencytests/Tests/Default/Default_101/
   trunk/consistencytests/Tests/Default/Default_102/
   trunk/consistencytests/Tests/Default/Default_103/
   trunk/consistencytests/Tests/Default/Default_104/
   trunk/run_consistencytests
Modified:
   trunk/consistencytests/Tests/Default/CMakeLists.txt
Log:

Minor refactoring of consistency tests to remove some redundancy.



Modified: trunk/consistencytests/Tests/Default/CMakeLists.txt
===================================================================
--- trunk/consistencytests/Tests/Default/CMakeLists.txt	2006-03-14 02:42:58 UTC (rev 517)
+++ trunk/consistencytests/Tests/Default/CMakeLists.txt	2006-03-14 04:54:58 UTC (rev 518)
@@ -22,7 +22,7 @@
 #
 # Consistency checks configuration
 #
-SET(TestDirBaseName "Default")
+SET(TestDirBaseName "Seed")
 
 # This is Python list of Avida random seeds.
 # E.g., "range(100,105)" is equivalent to the Python list "[100,101,102,103,104]".
@@ -47,9 +47,8 @@
 # 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}/${TestDirBaseName}_check_tails.py") 
+SET(CheckTailsScript "${CMAKE_CURRENT_BINARY_DIR}/check_tails.py") 
 CONFIGURE_FILE(${CheckTailsScriptTemplate} ${CheckTailsScript} IMMEDIATE)
 
 IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
@@ -70,7 +69,7 @@
 # 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}/${TestDirBaseName}_generate_tails.py") 
+SET(GenerateTailsScript "${CMAKE_CURRENT_BINARY_DIR}/generate_tails.py") 
 CONFIGURE_FILE(${GenerateTailsScriptTemplate} ${GenerateTailsScript} IMMEDIATE)
 
 # Vim modeline to tell Vim that this is a configuration script.

Copied: trunk/consistencytests/Tests/Default/Seed_100 (from rev 517, trunk/consistencytests/Tests/Default/Default_100)

Copied: trunk/consistencytests/Tests/Default/Seed_101 (from rev 517, trunk/consistencytests/Tests/Default/Default_101)

Copied: trunk/consistencytests/Tests/Default/Seed_102 (from rev 517, trunk/consistencytests/Tests/Default/Default_102)

Copied: trunk/consistencytests/Tests/Default/Seed_103 (from rev 517, trunk/consistencytests/Tests/Default/Default_103)

Copied: trunk/consistencytests/Tests/Default/Seed_104 (from rev 517, trunk/consistencytests/Tests/Default/Default_104)

Deleted: trunk/run_consistencytests
===================================================================
--- trunk/run_consistencytests	2006-03-14 02:42:58 UTC (rev 517)
+++ trunk/run_consistencytests	2006-03-14 04:54:58 UTC (rev 518)
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-mkdir -p build
-cd build
-cmake \
-  -DAVD_CONSISTENCY_TEST_PRIMITIVE:BOOL=ON \
-  -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-  ../
-make
-make install
-ctest --verbose -R Consistency
-

Copied: trunk/test_avida (from rev 509, trunk/run_consistencytests)
===================================================================
--- trunk/run_consistencytests	2006-03-13 12:34:09 UTC (rev 509)
+++ trunk/test_avida	2006-03-14 04:54:58 UTC (rev 518)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mkdir -p build
+cd build
+cmake \
+  -DAVD_CONSISTENCY_TEST_PRIMITIVE:BOOL=ON \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
+  ../
+make
+make install
+ctest --verbose -R Consistency