From 8e2e7ec8fe8054bcfb087492e8a9379508fa6e82 Mon Sep 17 00:00:00 2001 From: navarrop Date: Wed, 21 Jul 2010 09:45:55 +0000 Subject: [PATCH] Cosmetics. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8040 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/AddTests.cmake | 2 +- buildtools/Cmake/CTestConfig.cmake | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 3999a7ba1b..c5060126af 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -272,6 +272,6 @@ add_test(test-simdag-1 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path: add_test(test-simdag-2 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/small_platform.xml) add_test(test-simdag-3 ${PROJECT_DIRECTORY}/testsuite/simdag/sd_test --cfg=path:${PROJECT_DIRECTORY}/testsuite/simdag ${PROJECT_DIRECTORY}/examples/msg/msg_platform.xml) -add_test(testall ${CMAKE_BUILD_DIR}/src/testall) +add_test(testall ${PROJECT_DIRECTORY}/src/testall) include(${PROJECT_DIRECTORY}/buildtools/Cmake/memcheck_tests.cmake) diff --git a/buildtools/Cmake/CTestConfig.cmake b/buildtools/Cmake/CTestConfig.cmake index 66268f7f44..5756545ae3 100644 --- a/buildtools/Cmake/CTestConfig.cmake +++ b/buildtools/Cmake/CTestConfig.cmake @@ -51,8 +51,7 @@ SET(CTEST_PROJECT_NAME "${PROJECT_NAME}") SET(CTEST_CUSTOM_MAXIMUM_FAILED_TEST_OUTPUT_SIZE "3000000") SET(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE "3000000") -exec_program("echo $PIPOL_IMAGE" OUTPUT_VARIABLE PIPOL_IMAGE) -#message("PIPOL_IMAGE : \"${PIPOL_IMAGE}\"") +set(PIPOL_IMAGE $ENV{PIPOL_IMAGE}) if(NOT ${PIPOL_IMAGE} MATCHES "\n") set(SITE ${PIPOL_IMAGE}) endif(NOT ${PIPOL_IMAGE} MATCHES "\n") -- 2.20.1