[Avida-cvs] [avida-svn] r555 - development

[kaben@myxo.css.msu.edu]

Author: kaben
Date: 2006-04-03 18:20:00 -0400 (Mon, 03 Apr 2006)
New Revision: 555

Modified:
   development/CMakeLists.txt
   development/test_avida
Log:

./test_avida only runs tests now, doesn't build Avida. Must be run after
Avida has been built.



Modified: development/CMakeLists.txt
===================================================================
--- development/CMakeLists.txt	2006-04-03 22:04:39 UTC (rev 554)
+++ development/CMakeLists.txt	2006-04-03 22:20:00 UTC (rev 555)
@@ -162,7 +162,7 @@
 	# are run via 'make test' under unix.
 	OPTION(AVD_CONSISTENCY_TEST_PRIMITIVE
 		"Enable primitive consistency test suites."
-		OFF
+		ON
 	)
 	IF(AVD_CONSISTENCY_TEST_PRIMITIVE)
 		IF(EXISTS ${PROJECT_SOURCE_DIR}/consistencytests)

Modified: development/test_avida
===================================================================
--- development/test_avida	2006-04-03 22:04:39 UTC (rev 554)
+++ development/test_avida	2006-04-03 22:20:00 UTC (rev 555)
@@ -1,11 +1,3 @@
 #!/bin/sh
 
-mkdir -p build
-cd build
-cmake \
-  -DAVD_CONSISTENCY_TEST_PRIMITIVE:BOOL=ON \
-  -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
-  ../
-make
-make install
-ctest --verbose "$@"
+cd build && ctest --verbose "$@"