diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
-rw-r--r-- | tests/dummy-indicator-blank.c | 2 | ||||
-rw-r--r-- | tests/dummy-indicator-entry-func.h | 2 | ||||
-rw-r--r-- | tests/dummy-indicator-null.c | 2 | ||||
-rw-r--r-- | tests/dummy-indicator-signaler.c | 2 | ||||
-rw-r--r-- | tests/dummy-indicator-simple.c | 2 | ||||
-rw-r--r-- | tests/dummy-indicator-visible.c | 2 | ||||
-rw-r--r-- | tests/run-xvfb.sh | 2 | ||||
-rw-r--r-- | tests/service-manager-connect-service.c | 2 | ||||
-rw-r--r-- | tests/service-manager-connect.c | 2 | ||||
-rw-r--r-- | tests/service-manager-no-connect.c | 2 | ||||
-rw-r--r-- | tests/service-manager-nostart-connect.c | 2 | ||||
-rw-r--r-- | tests/service-shutdown-timeout.c | 2 | ||||
-rw-r--r-- | tests/service-version-bad-service.c | 2 | ||||
-rw-r--r-- | tests/service-version-good-service.c | 2 | ||||
-rw-r--r-- | tests/service-version-manager.c | 2 | ||||
-rw-r--r-- | tests/service-version-multiwatch-manager-impolite.c | 2 | ||||
-rw-r--r-- | tests/service-version-multiwatch-manager.c | 2 | ||||
-rw-r--r-- | tests/service-version-multiwatch-service.c | 2 | ||||
-rw-r--r-- | tests/test-desktop-shortcuts.c | 2 | ||||
-rw-r--r-- | tests/test-loader.c | 2 |
21 files changed, 23 insertions, 26 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index a299b65..a461dab 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,7 +10,6 @@ find_program(DBUS_TEST_RUNNER dbus-test-runner) function(add_test_library_by_name name) set (TEST_LIBRARY_NAME ${name}) - set_source_files_properties(${TEST_LIBRARY_NAME}.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) add_library("${TEST_LIBRARY_NAME}" SHARED ${TEST_LIBRARY_NAME}.c) target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_include_directories("${TEST_LIBRARY_NAME}" PUBLIC "${CMAKE_SOURCE_DIR}/src") @@ -21,7 +20,6 @@ endfunction() function(add_test_executable_by_name name) set (TEST_EXECUTABLE_NAME ${name}) - set_source_files_properties(${TEST_EXECUTABLE_NAME}.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) add_executable("${TEST_EXECUTABLE_NAME}" ${TEST_EXECUTABLE_NAME}.c) target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}") target_compile_definitions("${TEST_EXECUTABLE_NAME}" PUBLIC SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}") @@ -187,7 +185,7 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND - echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" + echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-desktop-shortcuts-tester" COMMAND @@ -225,7 +223,7 @@ if (FLAVOUR_GTK3 AND ENABLE_IDO) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND - echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" + echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/test-indicator-ng-tester" COMMAND @@ -246,7 +244,7 @@ add_custom_command( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} VERBATIM COMMAND - echo "#!/bin/bash" > "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" + echo "#!/bin/sh" > "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" COMMAND echo ". ${CMAKE_CURRENT_SOURCE_DIR}/run-xvfb.sh" >> "${CMAKE_CURRENT_BINARY_DIR}/loader-tester" COMMAND @@ -257,7 +255,6 @@ add_custom_command( add_test("loader-tester" "loader-tester") # indicator-test-service -set_source_files_properties(indicator-test-service.c PROPERTIES COMPILE_FLAGS ${COMPILE_FLAGS}) add_executable("indicator-test-service" indicator-test-service.c) target_include_directories("indicator-test-service" PUBLIC ${PROJECT_DEPS_INCLUDE_DIRS}) target_link_libraries("indicator-test-service" ${PROJECT_DEPS_LIBRARIES}) diff --git a/tests/dummy-indicator-blank.c b/tests/dummy-indicator-blank.c index e447d6c..1f30f40 100644 --- a/tests/dummy-indicator-blank.c +++ b/tests/dummy-indicator-blank.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/dummy-indicator-entry-func.h b/tests/dummy-indicator-entry-func.h index 97b3a04..9d5e7a1 100644 --- a/tests/dummy-indicator-entry-func.h +++ b/tests/dummy-indicator-entry-func.h @@ -2,7 +2,7 @@ Test for libindicator Copyright 2012 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/dummy-indicator-null.c b/tests/dummy-indicator-null.c index adb05d3..addfd4c 100644 --- a/tests/dummy-indicator-null.c +++ b/tests/dummy-indicator-null.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/dummy-indicator-signaler.c b/tests/dummy-indicator-signaler.c index 2fa3a8b..ae7f121 100644 --- a/tests/dummy-indicator-signaler.c +++ b/tests/dummy-indicator-signaler.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/dummy-indicator-simple.c b/tests/dummy-indicator-simple.c index e42d1fe..bbe11b5 100644 --- a/tests/dummy-indicator-simple.c +++ b/tests/dummy-indicator-simple.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/dummy-indicator-visible.c b/tests/dummy-indicator-visible.c index 639f7c8..4e4d12f 100644 --- a/tests/dummy-indicator-visible.c +++ b/tests/dummy-indicator-visible.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2012 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Charles Kerr <charles.kerr@canonical.com> diff --git a/tests/run-xvfb.sh b/tests/run-xvfb.sh index 63b6f0d..16c5f65 100644 --- a/tests/run-xvfb.sh +++ b/tests/run-xvfb.sh @@ -1,4 +1,4 @@ -if [ "$DISPLAY" == "" ]; then +if [ "$DISPLAY" = "" ]; then Xvfb -ac -noreset -screen 0 800x600x16 -help 2>/dev/null 1>&2 XID=`for id in 101 102 103 104 105 106 107 197 199 211 223 227 293 307 308 309 310 311 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 4703 4721 4723 4729 4733 4751 9973 9974 9975 9976 9977 9978 9979 9980 9981 9982 9983 9984 9985 9986 9987 9988 9989 9990 9991 9992 9993 9994 9995 9996 9997 9998 9999 ; do test -e /tmp/.X$id-lock || { echo $id; exit 0; }; done; exit 1` { Xvfb -ac -noreset -screen 0 800x600x16 :$XID -screen 0 800x600x16 -nolisten tcp -auth /dev/null >/dev/null 2>&1 & trap "kill -15 $! " 0 HUP INT QUIT TRAP USR1 PIPE TERM ; } || { echo "Gtk+Tests:ERROR: Failed to start Xvfb environment for X11 target tests."; exit 1; } diff --git a/tests/service-manager-connect-service.c b/tests/service-manager-connect-service.c index a17bada..7d8aa5a 100644 --- a/tests/service-manager-connect-service.c +++ b/tests/service-manager-connect-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-manager-connect.c b/tests/service-manager-connect.c index cf7cb6a..e655d8c 100644 --- a/tests/service-manager-connect.c +++ b/tests/service-manager-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-manager-no-connect.c b/tests/service-manager-no-connect.c index 5b5d389..7f1e378 100644 --- a/tests/service-manager-no-connect.c +++ b/tests/service-manager-no-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-manager-nostart-connect.c b/tests/service-manager-nostart-connect.c index 44a87a9..f596d1a 100644 --- a/tests/service-manager-nostart-connect.c +++ b/tests/service-manager-nostart-connect.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-shutdown-timeout.c b/tests/service-shutdown-timeout.c index 338ebb6..d8401a6 100644 --- a/tests/service-shutdown-timeout.c +++ b/tests/service-shutdown-timeout.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-bad-service.c b/tests/service-version-bad-service.c index 46574cb..28735be 100644 --- a/tests/service-version-bad-service.c +++ b/tests/service-version-bad-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-good-service.c b/tests/service-version-good-service.c index 3257ce2..c246c7b 100644 --- a/tests/service-version-good-service.c +++ b/tests/service-version-good-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-manager.c b/tests/service-version-manager.c index 07c6173..afb36f8 100644 --- a/tests/service-version-manager.c +++ b/tests/service-version-manager.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-multiwatch-manager-impolite.c b/tests/service-version-multiwatch-manager-impolite.c index 97678d3..dc5194a 100644 --- a/tests/service-version-multiwatch-manager-impolite.c +++ b/tests/service-version-multiwatch-manager-impolite.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-multiwatch-manager.c b/tests/service-version-multiwatch-manager.c index 7f82e82..d53de8d 100644 --- a/tests/service-version-multiwatch-manager.c +++ b/tests/service-version-multiwatch-manager.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/service-version-multiwatch-service.c b/tests/service-version-multiwatch-service.c index e1ca660..504f12a 100644 --- a/tests/service-version-multiwatch-service.c +++ b/tests/service-version-multiwatch-service.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/test-desktop-shortcuts.c b/tests/test-desktop-shortcuts.c index 48a668d..63917a2 100644 --- a/tests/test-desktop-shortcuts.c +++ b/tests/test-desktop-shortcuts.c @@ -2,7 +2,7 @@ Test for libayatana-indicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> diff --git a/tests/test-loader.c b/tests/test-loader.c index d6dabc5..fed3f40 100644 --- a/tests/test-loader.c +++ b/tests/test-loader.c @@ -2,7 +2,7 @@ Test for libindicator Copyright 2009 Canonical Ltd. -Copyright 2021 AyatanaIndicators +Copyright 2021 Robert Tari Authors: Ted Gould <ted@canonical.com> |