Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

Commit

Permalink
fixed test linkage for ubuntu, tested on 14.04. added support for tes…
Browse files Browse the repository at this point in the history 
…t-coverage.sh to use xdg-open rather than open when present, ie on ubuntu.
  • Loading branch information
@paegun
paegun committed Apr 7, 2016
1 parent 01f970f commit d5c2fec
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 15 deletions.
13 changes: 11 additions & 2 deletions test-coverage.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion test/array/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/bstring/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/channel/pipe/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion test/channel/tcp/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion test/event/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/log/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/metric/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/option/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion test/pool/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/rbuf/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/ring_array/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion test/time/timer/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
2 changes: 1 addition & 1 deletion test/time/wheel/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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})

0 comments on commit d5c2fec

Please sign in to comment.