From 8cfa168f82334f6af502377abd0a47c1539fa2c8 Mon Sep 17 00:00:00 2001 From: Hy Murveit Date: Sun, 26 Dec 2021 07:16:51 +0000 Subject: [PATCH] re-enable the scheduler_ops test, keep it unstable for now --- .gitlab-ci.yml | 8 ++++++++ Tests/kstars_ui/CMakeLists.txt | 7 +++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edf0922243..6febf37035 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,6 +67,10 @@ build-and-test-stable: - rm -rf Testing - mkdir -p /var/run/dbus - dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address + - dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames + - apt install dbus-x11 + - export $(dbus-launch) + - dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames - xvfb-run ctest -T test -L stable --output-on-failure after_script: - pwd @@ -92,6 +96,10 @@ build-and-test-unstable: - rm -rf Testing - mkdir -p /var/run/dbus - dbus-daemon --config-file=/usr/share/dbus-1/system.conf --print-address + - dbus-send --system --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames + - apt install dbus-x11 + - export $(dbus-launch) + - dbus-send --session --dest=org.freedesktop.DBus --type=method_call --print-reply /org/freedesktop/DBus org.freedesktop.DBus.ListNames - xvfb-run ctest -T test -LE stable --output-on-failure --no-compress-output after_script: - pwd diff --git a/Tests/kstars_ui/CMakeLists.txt b/Tests/kstars_ui/CMakeLists.txt index 09df6422c8..13bff0b930 100644 --- a/Tests/kstars_ui/CMakeLists.txt +++ b/Tests/kstars_ui/CMakeLists.txt @@ -122,10 +122,9 @@ ADD_CUSTOM_COMMAND( TARGET test_ekos_scheduler_ops POST_BUILD ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kstars.MockEkos.MockGuide.xml ${CMAKE_CURRENT_SOURCE_DIR}/org.kde.kstars.MockEkos.MockMount.xml ${CMAKE_CURRENT_BINARY_DIR}) -# JM 2021-08-06: Setting as unstable since DBus appears not to work correctly under the CI environment. -# Warrants more investigation. -#ADD_TEST(NAME TestEkosSchedulerOps COMMAND test_ekos_scheduler_ops) -#SET_TESTS_PROPERTIES( TestEkosSchedulerOps PROPERTIES LABELS "unstable;ui" TIMEOUT 120 ) + +ADD_TEST(NAME TestEkosSchedulerOps COMMAND test_ekos_scheduler_ops) +SET_TESTS_PROPERTIES( TestEkosSchedulerOps PROPERTIES LABELS "unstable;ui" TIMEOUT 120 ) ADD_EXECUTABLE(test_artificial_horizon ${KSTARS_UI_EKOS_SRC} test_artificial_horizon.cpp) TARGET_LINK_LIBRARIES(test_artificial_horizon ${KSTARS_UI_EKOS_LIBS})