More work on cmake/ctest cruft

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6943 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/Makefile.am b/Makefile.am
index 3f53aa1..2983dab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,8 @@ SG_EXTRA_DIST = bootstrap COPYING INSTALL NEWS README README.IEEE TODO AUTHORS C
        checkall \
        buildtools/Cmake/CMakeLists.txt buildtools/Cmake/chdir_run.sh \
         buildtools/Cmake/build.sh buildtools/Cmake/test_java.sh \
-       buildtools/Cmake/CTestList.txt buildtools/Cmake/CTestConfig.txt
+       buildtools/Cmake/CTestList.txt buildtools/Cmake/CTestConfig.txt \
+       buildtools/Cmake/CTestCustom.ctest
 # GRAMINE_CUT_END
 
 SUBDIRS= include src tools $(SG_SUBDIRS)

diff --git a/buildtools/Cmake/CMakeLists.txt b/buildtools/Cmake/CMakeLists.txt
index 18ca92b..5c753be 100644 (file)
--- a/buildtools/Cmake/CMakeLists.txt
+++ b/buildtools/Cmake/CMakeLists.txt
@@ -19,6 +19,7 @@ ELSE(SIZEOF_INT EQUAL 4)
   SET(ARCH_64_BITS 1)
 ENDIF(SIZEOF_INT EQUAL 4)
 
+INCLUDE(CTestConfig.txt)
 
 ### Enable tests
 ENABLE_TESTING()
@@ -26,9 +27,12 @@ INCLUDE(CTest)
 INCLUDE(Dart)
 
 
-INCLUDE(CTestConfig.txt)
 INCLUDE(CTestList.txt)
 
+# Install the CTest configuration in the build dir
+configure_file(CTestCustom.ctest ${CMAKE_BINARY_DIR}/CTestCustom.ctest
+COPYONLY)
+
 #SET (CMAKE_COMPILER_IS_GNUCXX 1)
 #SET (CMAKE_COMPILER_IS_GNUCC 1)
 

diff --git a/buildtools/Cmake/Cmake/CTestCustom.cmake b/buildtools/Cmake/CTestCustom.ctest
similarity index 52%
rename from buildtools/Cmake/Cmake/CTestCustom.cmake
rename to buildtools/Cmake/CTestCustom.ctest
index 587a617..d6b3ca2 100644 (file)
--- a/buildtools/Cmake/Cmake/CTestCustom.cmake
+++ b/buildtools/Cmake/CTestCustom.ctest
@@ -1,2 +1,6 @@
+# Configure CTest. For details, see:
+# http://www.cmake.org/Wiki/CMake_Testing_With_CTest#Customizing_CTest
+
 SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
 SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
+

diff --git a/buildtools/Cmake/CTestList.txt b/buildtools/Cmake/CTestList.txt
index f7c65af..8d94abf 100644 (file)
--- a/buildtools/Cmake/CTestList.txt
+++ b/buildtools/Cmake/CTestList.txt
@@ -24,19 +24,18 @@ ADD_TEST(tesh-self-background,         "../../tools/tesh/tesh" --cd ../../tools/
 
 # testsuite directory
 ADD_TEST(test-xbt-log,      "./chdir_run.sh" ../../testsuite xbt/log_usage)
-ADD_TEST(test-xbt-context,  "./chdir_run.sh" ../../testsuite xbt/context_usage)
 ADD_TEST(test-xbt-graphxml, "./chdir_run.sh" ../../testsuite xbt/graphxml_usage ./xbt/graph.xml)
 ADD_TEST(test-xbt-heap,     "./chdir_run.sh" ../../testsuite xbt/heap_bench)
 
 ADD_TEST(test-surf-lmm,     "./chdir_run.sh" ../../testsuite surf/lmm_usage)
 ADD_TEST(test-surf-maxmin,  "./chdir_run.sh" ../../testsuite surf/maxmin_bench)
-ADD_TEST(test-surf-trace,   "./chdir_run.sh" ../../testsuite surf/trace_usage --surf-path=./surf/)
-ADD_TEST(test-surf-usage,   "./chdir_run.sh" ../../testsuite surf/surf_usage  --surf-path=./surf/ platform.xml)
-ADD_TEST(test-surf-usage2,  "./chdir_run.sh" ../../testsuite surf/surf_usage2 --surf-path=./surf/ platform.xml)
+ADD_TEST(test-surf-trace,   "./chdir_run.sh" ../../testsuite surf/trace_usage --cfg=path:./surf/)
+ADD_TEST(test-surf-usage,   "./chdir_run.sh" ../../testsuite surf/surf_usage  --cfg=path:./surf/ platform.xml)
+ADD_TEST(test-surf-usage2,  "./chdir_run.sh" ../../testsuite surf/surf_usage2 --cfg=path:./surf/ platform.xml)
 
-ADD_TEST(test-simdag-1, "./chdir_run.sh" ../../testsuite simdag/sd_test --surf-path=./simdag ./simdag/small_platform_variable.xml)
-ADD_TEST(test-simdag-2, "./chdir_run.sh" ../../testsuite simdag/sd_test --surf-path=./simdag ../../examples/msg/small_platform.xml)
-ADD_TEST(test-simdag-3, "./chdir_run.sh" ../../testsuite simdag/sd_test --surf-path=./simdag ../../examples/msg/msg_platform.xml)
+ADD_TEST(test-simdag-1, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ./simdag/small_platform_variable.xml)
+ADD_TEST(test-simdag-2, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ../../examples/msg/small_platform.xml)
+ADD_TEST(test-simdag-3, "./chdir_run.sh" ../../testsuite simdag/sd_test --cfg=path:./simdag ../../examples/msg/msg_platform.xml)
 
 # teshsuite directory
 ADD_TEST(tesh-log-large,    "../../tools/tesh/tesh" --cd ../../teshsuite "xbt/log_large_test.tesh")

diff --git a/buildtools/Cmake/Cmake/build.sh b/buildtools/Cmake/Cmake/build.sh
deleted file mode 100755 (executable)
index 626dab4..0000000
--- a/buildtools/Cmake/Cmake/build.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-cd ..
-if [ ! -e configure ] ; then
-  ./bootstrap
-fi
-
-if [ ! -e Makefile ] ; then
-  ./configure --enable-maintainer-mode --disable-compile-optimizations
-fi
-
-make
\ No newline at end of file

diff --git a/buildtools/Cmake/Cmake/test_java.sh b/buildtools/Cmake/test_java.sh
similarity index 100%
rename from buildtools/Cmake/Cmake/test_java.sh
rename to buildtools/Cmake/test_java.sh