aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.build.yml65
-rw-r--r--tests/CMakeLists.txt12
2 files changed, 37 insertions, 40 deletions
diff --git a/.build.yml b/.build.yml
index fe8c462..eac5ff1 100644
--- a/.build.yml
+++ b/.build.yml
@@ -13,9 +13,9 @@ requires:
- cmake-extras
- dbus
- intltool
-# - libayatana-common
+ - libayatana-common
- gobject-introspection
-# - liblomiri-url-dispatcher
+# - lomiri-url-dispatcher
- vala
- glib2
- libnotify
@@ -24,7 +24,7 @@ requires:
- evolution-data-server
- gsettings-desktop-schemas
- properties-cpp
-# - ayatana-indicator-messages
+ - ayatana-indicator-messages
- gtk-doc-tools
- libaccountsservice
# - lomiri-schemas
@@ -41,7 +41,8 @@ requires:
- cmake-extras
- intltool
- libaccounts-glib-dev
-# - libayatana-common-dev
+ - libayatana-common-dev
+ - ayatana-indicator-common
- gobject-introspection
- libgirepository1.0-dev
- liblomiri-url-dispatcher-dev
@@ -53,12 +54,12 @@ requires:
- libical-dev
- libedataserver1.2-dev
- libproperties-cpp-dev
-# - libmessaging-menu-dev
+ - libmessaging-menu-dev
- gtk-doc-tools
- libaccountsservice-dev
- liblomiri-url-dispatcher-dev
-# - lomiri-schemas
-# - lomiri-sounds
+ - lomiri-schemas
+ - lomiri-sounds
# for the test harness:
- libgtest-dev
- libdbustest1-dev
@@ -83,12 +84,13 @@ requires:
- cmake-extras
- intltool
- libaccounts-glib-dev
-# - libayatana-common-dev
+ - libayatana-common-dev
+ - ayatana-indicator-common
- gobject-introspection
- libgirepository1.0-dev
- liblomiri-url-dispatcher-dev
-# - lomiri-schemas
-# - lomiri-sounds
+ - lomiri-schemas
+ - lomiri-sounds
- valac
- libglib2.0-dev
- libnotify-dev
@@ -97,7 +99,7 @@ requires:
- libical-dev
- libedataserver1.2-dev
- libproperties-cpp-dev
-# - libmessaging-menu-dev
+ - libmessaging-menu-dev
- gtk-doc-tools
- libaccountsservice-dev
# for the test harness:
@@ -125,6 +127,7 @@ requires:
- intltool
- libaccounts-glib-dev
# - libayatana-common-dev
+ - ayatana-indicator-common
- gobject-introspection
- libgirepository1.0-dev
# - liblomiri-url-dispatcher-dev
@@ -200,29 +203,27 @@ before_scripts:
- cd -
- rm -Rf ayatana-indicator-messages-build/
-
- - if [ ${DISTRO_NAME} == "debian" ];then
- - cd ${START_DIR}
- - if [ ! -d lomiri-schemas-build ]; then
- - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
- - fi
- - cd lomiri-schemas-build
- - cmake . -DCMAKE_INSTALL_PREFIX=/usr
- - make
- - make install
- - cd -
- - rm -Rf lomiri-schemas-build/
+ - cd ${START_DIR}
+ - if [ ! -d lomiri-schemas-build ]; then
+ - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
+ - fi
+ - cd lomiri-schemas-build
+ - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ - make
+ - make install
+ - cd -
+ - rm -Rf lomiri-schemas-build/
-
- - cd ${START_DIR}
- - if [ ! -d lomiri-sounds-build ]; then
- - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
- - fi
- - cd lomiri-sounds-build
- - cmake . -DCMAKE_INSTALL_PREFIX=/usr
- - make
- - make install
- - cd -
- - rm -Rf lomiri-sounds-build/
+ - cd ${START_DIR}
+ - if [ ! -d lomiri-sounds-build ]; then
+ - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
- fi
+ - cd lomiri-sounds-build
+ - cmake . -DCMAKE_INSTALL_PREFIX=/usr
+ - make
+ - make install
+ - cd -
+ - rm -Rf lomiri-sounds-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index db85e45..a0687f4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -45,8 +45,7 @@ add_test_by_name(test-datetime)
if (ENABLE_LOMIRI_FEATURES)
add_test_by_name(test-sound)
- # This one only succeeds on Lomiri because it needs hfd-service
- # add_test_by_name(test-notification)
+ add_test_by_name(test-notification)
add_test_by_name(test-notification-response)
endif()
@@ -54,18 +53,15 @@ add_test_by_name(test-actions)
add_test_by_name(test-alarm-queue)
add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true)
add_test_by_name(test-clock)
-# This one is fine, but hangs on Travis CI
-# add_test_by_name(test-exporter)
+add_test_by_name(test-exporter)
add_test_by_name(test-formatter)
add_test_by_name(test-live-actions)
add_test_by_name(test-locations)
add_test_by_name(test-menu-appointments)
-# This one is fine, but hangs on Travis CI
-# add_test_by_name(test-menus)
+add_test_by_name(test-menus)
add_test_by_name(test-planner)
add_test_by_name(test-settings)
-# This one is fine, but hangs on Travis CI
-# add_test_by_name(test-timezone-timedated)
+add_test_by_name(test-timezone-timedated)
add_test_by_name(test-utils)
if (ENABLE_LOMIRI_FEATURES)