From d5c2fec0b7e5f3c386946e6832ae2dc1782e3bc0 Mon Sep 17 00:00:00 2001 From: paegun Date: Thu, 7 Apr 2016 12:00:34 -0700 Subject: [PATCH] fixed test linkage for ubuntu, tested on 14.04. added support for test-coverage.sh to use xdg-open rather than open when present, ie on ubuntu. --- test-coverage.sh | 13 +++++++++++-- test/array/CMakeLists.txt | 2 +- test/bstring/CMakeLists.txt | 2 +- test/channel/pipe/CMakeLists.txt | 2 +- test/channel/tcp/CMakeLists.txt | 2 +- test/event/CMakeLists.txt | 2 +- test/log/CMakeLists.txt | 2 +- test/metric/CMakeLists.txt | 2 +- test/option/CMakeLists.txt | 2 +- test/pool/CMakeLists.txt | 2 +- test/rbuf/CMakeLists.txt | 2 +- test/ring_array/CMakeLists.txt | 2 +- test/time/timer/CMakeLists.txt | 2 +- test/time/wheel/CMakeLists.txt | 2 +- 14 files changed, 24 insertions(+), 15 deletions(-) diff --git a/test-coverage.sh b/test-coverage.sh index 2ccd30d44..f6d923818 100755 --- a/test-coverage.sh +++ b/test-coverage.sh @@ -5,7 +5,16 @@ rm -rf lcov _build _bin && mkdir _build && pushd _build && cmake -DCOVERAGE=on . mkdir lcov lcov --directory . --capture --output-file lcov/app.info genhtml lcov/app.info -o lcov/html -if [[ "$OSTYPE" == "darwin"* ]]; then - open lcov/html/index.html + +COVERAGE_FILE="lcov/html/index.html" +if which xdg-open; then + OPEN=xdg-open +elif [[ $OSTYPE == "darwin"* ]]; then + OPEN=open +else + >&2 echo "Don't know how to automate open, coverage file is at: $COVERAGE_FILE" +fi +if [[ ! -z "$OPEN" ]]; then + $OPEN $COVERAGE_FILE fi set +e diff --git a/test/array/CMakeLists.txt b/test/array/CMakeLists.txt index bdc7cc9f0..d509c1b18 100644 --- a/test/array/CMakeLists.txt +++ b/test/array/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/bstring/CMakeLists.txt b/test/bstring/CMakeLists.txt index 41c1f87c6..37f16e59a 100644 --- a/test/bstring/CMakeLists.txt +++ b/test/bstring/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/channel/pipe/CMakeLists.txt b/test/channel/pipe/CMakeLists.txt index 552999bb2..d5e1ca072 100644 --- a/test/channel/pipe/CMakeLists.txt +++ b/test/channel/pipe/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} m) target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT}) add_dependencies(check ${test_name}) diff --git a/test/channel/tcp/CMakeLists.txt b/test/channel/tcp/CMakeLists.txt index 932e8f12e..7bfca443b 100644 --- a/test/channel/tcp/CMakeLists.txt +++ b/test/channel/tcp/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} m) target_link_libraries(${test_name} ${CMAKE_THREAD_LIBS_INIT}) add_dependencies(check ${test_name}) diff --git a/test/event/CMakeLists.txt b/test/event/CMakeLists.txt index 506aa4a83..4b2cbef98 100644 --- a/test/event/CMakeLists.txt +++ b/test/event/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/log/CMakeLists.txt b/test/log/CMakeLists.txt index 65caffc89..8ec5a9b77 100644 --- a/test/log/CMakeLists.txt +++ b/test/log/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/metric/CMakeLists.txt b/test/metric/CMakeLists.txt index 29e1cb077..d693a8334 100644 --- a/test/metric/CMakeLists.txt +++ b/test/metric/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/option/CMakeLists.txt b/test/option/CMakeLists.txt index 951980f85..6bc1f5be5 100644 --- a/test/option/CMakeLists.txt +++ b/test/option/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES}) target_link_libraries(${test_name} m) add_dependencies(check ${test_name}) diff --git a/test/pool/CMakeLists.txt b/test/pool/CMakeLists.txt index 1fe7362f0..69976da5a 100644 --- a/test/pool/CMakeLists.txt +++ b/test/pool/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/rbuf/CMakeLists.txt b/test/rbuf/CMakeLists.txt index 1b9dfc600..315bd625e 100644 --- a/test/rbuf/CMakeLists.txt +++ b/test/rbuf/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/ring_array/CMakeLists.txt b/test/ring_array/CMakeLists.txt index 8d0f49f17..6b65c7487 100644 --- a/test/ring_array/CMakeLists.txt +++ b/test/ring_array/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name}) diff --git a/test/time/timer/CMakeLists.txt b/test/time/timer/CMakeLists.txt index 4931ccbac..f1b19cb68 100644 --- a/test/time/timer/CMakeLists.txt +++ b/test/time/timer/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES}) target_link_libraries(${test_name} m) add_dependencies(check ${test_name}) diff --git a/test/time/wheel/CMakeLists.txt b/test/time/wheel/CMakeLists.txt index 8359c01d1..5ebe5f0ed 100644 --- a/test/time/wheel/CMakeLists.txt +++ b/test/time/wheel/CMakeLists.txt @@ -4,7 +4,7 @@ set(test_name check_${suite}) set(source check_${suite}.c) add_executable(${test_name} ${source}) -target_link_libraries(${test_name} ccommon-static ${CHECK_LIBRARIES}) +target_link_libraries(${test_name} ccommon-static ${CMAKE_THREAD_LIBS_INIT} ${CHECK_LIBRARIES} m) add_dependencies(check ${test_name}) add_test(${test_name} ${test_name})