diff options
| author | Alan Conway <aconway@apache.org> | 2015-04-03 18:59:47 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2015-04-03 18:59:47 +0000 |
| commit | 47f4f5148f7a6f4fa3c214cc2efd4e4a3f44641c (patch) | |
| tree | 0c1bb11fad453248ca6b982487963fcd06a5094e | |
| parent | adf734ee29572f09465adc7d92caee4f96f1d074 (diff) | |
| download | qpid-python-47f4f5148f7a6f4fa3c214cc2efd4e4a3f44641c.tar.gz | |
QPID-6399: Fix store tests for run_test option syntax change.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1671128 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | qpid/cpp/src/tests/legacystore/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/linearstore/CMakeLists.txt | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/qpid/cpp/src/tests/legacystore/CMakeLists.txt b/qpid/cpp/src/tests/legacystore/CMakeLists.txt index 7986464eb5..5527f23255 100644 --- a/qpid/cpp/src/tests/legacystore/CMakeLists.txt +++ b/qpid/cpp/src/tests/legacystore/CMakeLists.txt @@ -28,7 +28,7 @@ endif (QPID_LINK_BOOST_DYNAMIC) include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -set(test_wrap ${shell} ${CMAKE_SOURCE_DIR}/src/tests/run_test${test_script_suffix} --build-dir=${CMAKE_BINARY_DIR}) +set(test_wrap ${shell} ${CMAKE_SOURCE_DIR}/src/tests/run_test${test_script_suffix} -buildDir=${CMAKE_BINARY_DIR}) if (BUILD_TESTING_UNITTESTS) @@ -54,7 +54,7 @@ if ("${ARGV1}" STREQUAL "LONG") set_target_properties(${testname} PROPERTIES COMPILE_DEFINITIONS LONG_TEST) endif () remember_location(${testname}) -add_test (${testname} ${test_wrap} --boost-test -- ${${testname}_LOCATION}) +add_test (${testname} ${test_wrap} -boostTest -- ${${testname}_LOCATION}) unset (testname) ENDMACRO (define_journal_test) @@ -101,7 +101,7 @@ target_link_libraries (jtt__ut ${Boost_PROGRAM_OPTIONS_LIBRARY} ${clock_gettime_LIB} legacystore_shared) -add_test(journal_jtt_ut ${test_wrap} --boost-test --working-dir=${CMAKE_CURRENT_SOURCE_DIR}/jrnl/jtt -- ${CMAKE_CURRENT_BINARY_DIR}/jtt__ut) +add_test(journal_jtt_ut ${test_wrap} -boostTest -workingDir=${CMAKE_CURRENT_SOURCE_DIR}/jrnl/jtt -- ${CMAKE_CURRENT_BINARY_DIR}/jtt__ut) endif (BUILD_TESTING_UNITTESTS) diff --git a/qpid/cpp/src/tests/linearstore/CMakeLists.txt b/qpid/cpp/src/tests/linearstore/CMakeLists.txt index 996a8c63c1..bf6c164818 100644 --- a/qpid/cpp/src/tests/linearstore/CMakeLists.txt +++ b/qpid/cpp/src/tests/linearstore/CMakeLists.txt @@ -21,7 +21,7 @@ if(BUILD_LINEARSTORE AND BUILD_TESTING) message(STATUS "Building linearstore tests") -set(test_wrap ${shell} ${CMAKE_SOURCE_DIR}/src/tests/run_test${test_script_suffix} --build-dir=${CMAKE_BINARY_DIR}) +set(test_wrap ${shell} ${CMAKE_SOURCE_DIR}/src/tests/run_test${test_script_suffix} -buildDir=${CMAKE_BINARY_DIR}) add_test (linearstore_python_tests ${test_wrap} -- ${CMAKE_CURRENT_SOURCE_DIR}/run_python_tests${test_script_suffix}) |