diff options
| author | anonymous <local@localhost> | 2010-09-27 02:15:47 +0000 |
|---|---|---|
| committer | anonymous <local@localhost> | 2010-09-27 02:15:47 +0000 |
| commit | 7d75a366cd49def1d95b2e1049d24441096c4cb4 (patch) | |
| tree | f235471cddd32c2407229176395cf68052cbd51a /test | |
| parent | 780f66a491a0e489afeb249f8067d470dbd77709 (diff) | |
| download | libcxxrt-7d75a366cd49def1d95b2e1049d24441096c4cb4.tar.gz libcxxrt-7d75a366cd49def1d95b2e1049d24441096c4cb4.tar.bz2 libcxxrt-7d75a366cd49def1d95b2e1049d24441096c4cb4.tar.xz | |
output argument was added in run_test script
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 12 | ||||
| -rwxr-xr-x | test/run_test.sh | 3 |
2 files changed, 10 insertions, 5 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 02e6e53..9e07dda 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -26,12 +26,14 @@ target_link_libraries(cxxrt-test-shared cxxrt-shared pthread dl c) add_test(cxxrt-test-static-test ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-static - ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log) + ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log + ${CMAKE_CURRENT_BINARY_DIR}/test-static-output.log) add_test(cxxrt-test-shared-test ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-shared - ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log) + ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log + ${CMAKE_CURRENT_BINARY_DIR}/test-shared-output.log) # Testing with libunwind @@ -51,7 +53,8 @@ if(TEST_LIBUNWIND) add_test(cxxrt-test-libunwind-static-test ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-libunwind-static - ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log) + ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log + ${CMAKE_CURRENT_BINARY_DIR}/test-libunwind-static-output.log) add_executable(cxxrt-test-libunwind-shared ${CXXTEST_SOURCES}) set_property(TARGET cxxrt-test-libunwind-shared PROPERTY LINK_FLAGS @@ -62,6 +65,7 @@ if(TEST_LIBUNWIND) add_test(cxxrt-test-libunwind-shared-test ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/cxxrt-test-libunwind-shared - ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log) + ${CMAKE_CURRENT_BINARY_DIR}/expected_output.log + ${CMAKE_CURRENT_BINARY_DIR}/test-libunwind-shared-output.log) endif() diff --git a/test/run_test.sh b/test/run_test.sh index 42795a7..7a4e724 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -1,4 +1,5 @@ test_command=$1 expected_output=$2 -$test_command > test_log 2>&1 +test_log=$3 +$test_command > $test_log 2>&1 diff test_log $expected_output |