git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6943
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
checkall \
buildtools/Cmake/CMakeLists.txt buildtools/Cmake/chdir_run.sh \
buildtools/Cmake/build.sh buildtools/Cmake/test_java.sh \
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)
# GRAMINE_CUT_END
SUBDIRS= include src tools $(SG_SUBDIRS)
SET(ARCH_64_BITS 1)
ENDIF(SIZEOF_INT EQUAL 4)
SET(ARCH_64_BITS 1)
ENDIF(SIZEOF_INT EQUAL 4)
+INCLUDE(CTestConfig.txt)
### Enable tests
ENABLE_TESTING()
### Enable tests
ENABLE_TESTING()
-INCLUDE(CTestConfig.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)
#SET (CMAKE_COMPILER_IS_GNUCXX 1)
#SET (CMAKE_COMPILER_IS_GNUCC 1)
+# 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")
SET (CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000")
SET (CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000")
# testsuite directory
ADD_TEST(test-xbt-log, "./chdir_run.sh" ../../testsuite xbt/log_usage)
# 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-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")
# teshsuite directory
ADD_TEST(tesh-log-large, "../../tools/tesh/tesh" --cd ../../teshsuite "xbt/log_large_test.tesh")
+++ /dev/null
-#! /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