Mercurial > hg > freeDiameter
changeset 737:03bcd4870f44
Set default output to CHECK only in nightly tests
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Wed, 02 Mar 2011 16:28:14 +0900 |
| parents | 9af507b1bd23 |
| children | d666051658bd |
| files | contrib/nightly_tests/runtests.sh tests/CMakeLists.txt |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/nightly_tests/runtests.sh Wed Mar 02 14:51:22 2011 +0900 +++ b/contrib/nightly_tests/runtests.sh Wed Mar 02 16:28:14 2011 +0900 @@ -106,7 +106,7 @@ set(CTEST_UPDATE_COMMAND "\${CTEST_HG_COMMAND}") set(CTEST_CONFIGURE_COMMAND "\${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=\${CTEST_BUILD_CONFIGURATION}") - set(CTEST_CONFIGURE_COMMAND "\${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON \${CTEST_BUILD_OPTIONS}") + set(CTEST_CONFIGURE_COMMAND "\${CTEST_CONFIGURE_COMMAND} -DWITH_TESTING:BOOL=ON -DOPT_TEST_ARGUMENTS:STRING=-d \${CTEST_BUILD_OPTIONS}") set(CTEST_CONFIGURE_COMMAND "\${CTEST_CONFIGURE_COMMAND} \\"-G\${CTEST_CMAKE_GENERATOR}\\"") set(CTEST_CONFIGURE_COMMAND "\${CTEST_CONFIGURE_COMMAND} \\"\${CTEST_SOURCE_DIRECTORY}\\"")
--- a/tests/CMakeLists.txt Wed Mar 02 14:51:22 2011 +0900 +++ b/tests/CMakeLists.txt Wed Mar 02 16:28:14 2011 +0900 @@ -7,6 +7,14 @@ ADD_DEFINITIONS(-DTEST_TIMEOUT=${TEST_TIMEOUT}) ENDIF(TEST_TIMEOUT) +# default command line for the tests +OPTION(OPT_TEST_ARGUMENTS "Specify the default arguments for the tests" OFF) +IF(OPT_TEST_ARGUMENT) + SET(TEST_ARGUMENTS ${OPT_TEST_ARGUMENTS}) +ELSE(OPT_TEST_ARGUMENT) + SET(TEST_ARGUMENTS "") +ENDIF(OPT_TEST_ARGUMENT) + ############################# # List the test cases @@ -97,7 +105,7 @@ FOREACH( TEST ${TEST_LIST} ) ADD_EXECUTABLE(${TEST} ${TEST}.c tests.h ${${TEST}_ADDITIONAL}) TARGET_LINK_LIBRARIES(${TEST} libfdproto libfdcore ${GNUTLS_LIBRARIES} ${GCRYPT_LIBRARY} ${${TEST}_ADDITIONAL_LIB}) - ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST}) + ADD_TEST(${TEST} ${EXECUTABLE_OUTPUT_PATH}/${TEST} ${TEST_ARGUMENTS}) ENDFOREACH( TEST )