Skip to content

Commit 069175a

Browse files
tari01sunweaver
authored andcommitted
Enable all tests
1 parent bae39a9 commit 069175a

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

.build.yml

+33-32
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ requires:
1313
- cmake-extras
1414
- dbus
1515
- intltool
16-
# - libayatana-common
16+
- libayatana-common
1717
- gobject-introspection
18-
# - liblomiri-url-dispatcher
18+
# - lomiri-url-dispatcher
1919
- vala
2020
- glib2
2121
- libnotify
@@ -24,7 +24,7 @@ requires:
2424
- evolution-data-server
2525
- gsettings-desktop-schemas
2626
- properties-cpp
27-
# - ayatana-indicator-messages
27+
- ayatana-indicator-messages
2828
- gtk-doc-tools
2929
- libaccountsservice
3030
# - lomiri-schemas
@@ -41,7 +41,8 @@ requires:
4141
- cmake-extras
4242
- intltool
4343
- libaccounts-glib-dev
44-
# - libayatana-common-dev
44+
- libayatana-common-dev
45+
- ayatana-indicator-common
4546
- gobject-introspection
4647
- libgirepository1.0-dev
4748
- liblomiri-url-dispatcher-dev
@@ -53,12 +54,12 @@ requires:
5354
- libical-dev
5455
- libedataserver1.2-dev
5556
- libproperties-cpp-dev
56-
# - libmessaging-menu-dev
57+
- libmessaging-menu-dev
5758
- gtk-doc-tools
5859
- libaccountsservice-dev
5960
- liblomiri-url-dispatcher-dev
60-
# - lomiri-schemas
61-
# - lomiri-sounds
61+
- lomiri-schemas
62+
- lomiri-sounds
6263
# for the test harness:
6364
- libgtest-dev
6465
- libdbustest1-dev
@@ -83,12 +84,13 @@ requires:
8384
- cmake-extras
8485
- intltool
8586
- libaccounts-glib-dev
86-
# - libayatana-common-dev
87+
- libayatana-common-dev
88+
- ayatana-indicator-common
8789
- gobject-introspection
8890
- libgirepository1.0-dev
8991
- liblomiri-url-dispatcher-dev
90-
# - lomiri-schemas
91-
# - lomiri-sounds
92+
- lomiri-schemas
93+
- lomiri-sounds
9294
- valac
9395
- libglib2.0-dev
9496
- libnotify-dev
@@ -97,7 +99,7 @@ requires:
9799
- libical-dev
98100
- libedataserver1.2-dev
99101
- libproperties-cpp-dev
100-
# - libmessaging-menu-dev
102+
- libmessaging-menu-dev
101103
- gtk-doc-tools
102104
- libaccountsservice-dev
103105
# for the test harness:
@@ -125,6 +127,7 @@ requires:
125127
- intltool
126128
- libaccounts-glib-dev
127129
# - libayatana-common-dev
130+
- ayatana-indicator-common
128131
- gobject-introspection
129132
- libgirepository1.0-dev
130133
# - liblomiri-url-dispatcher-dev
@@ -200,29 +203,27 @@ before_scripts:
200203
- cd -
201204
- rm -Rf ayatana-indicator-messages-build/
202205
-
203-
- if [ ${DISTRO_NAME} == "debian" ];then
204-
- cd ${START_DIR}
205-
- if [ ! -d lomiri-schemas-build ]; then
206-
- git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
207-
- fi
208-
- cd lomiri-schemas-build
209-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
210-
- make
211-
- make install
212-
- cd -
213-
- rm -Rf lomiri-schemas-build/
206+
- cd ${START_DIR}
207+
- if [ ! -d lomiri-schemas-build ]; then
208+
- git clone --depth 1 https://gitlab.com/ubports/core/lomiri-schemas.git lomiri-schemas-build
209+
- fi
210+
- cd lomiri-schemas-build
211+
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
212+
- make
213+
- make install
214+
- cd -
215+
- rm -Rf lomiri-schemas-build/
214216
-
215-
- cd ${START_DIR}
216-
- if [ ! -d lomiri-sounds-build ]; then
217-
- git clone --depth 1 https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
218-
- fi
219-
- cd lomiri-sounds-build
220-
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
221-
- make
222-
- make install
223-
- cd -
224-
- rm -Rf lomiri-sounds-build/
217+
- cd ${START_DIR}
218+
- if [ ! -d lomiri-sounds-build ]; then
219+
- git clone --depth 1 https://gitlab.com/ubports/core/lomiri-sounds.git lomiri-sounds-build
225220
- fi
221+
- cd lomiri-sounds-build
222+
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
223+
- make
224+
- make install
225+
- cd -
226+
- rm -Rf lomiri-sounds-build/
226227

227228
build_scripts:
228229
- if [ ${DISTRO_NAME} == "debian" ];then

tests/CMakeLists.txt

+4-8
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,23 @@ add_test_by_name(test-datetime)
4545

4646
if (ENABLE_LOMIRI_FEATURES)
4747
add_test_by_name(test-sound)
48-
# This one only succeeds on Lomiri because it needs hfd-service
49-
# add_test_by_name(test-notification)
48+
add_test_by_name(test-notification)
5049
add_test_by_name(test-notification-response)
5150
endif()
5251

5352
add_test_by_name(test-actions)
5453
add_test_by_name(test-alarm-queue)
5554
add_test(NAME dear-reader-the-next-test-takes-60-seconds COMMAND true)
5655
add_test_by_name(test-clock)
57-
# This one is fine, but hangs on Travis CI
58-
# add_test_by_name(test-exporter)
56+
add_test_by_name(test-exporter)
5957
add_test_by_name(test-formatter)
6058
add_test_by_name(test-live-actions)
6159
add_test_by_name(test-locations)
6260
add_test_by_name(test-menu-appointments)
63-
# This one is fine, but hangs on Travis CI
64-
# add_test_by_name(test-menus)
61+
add_test_by_name(test-menus)
6562
add_test_by_name(test-planner)
6663
add_test_by_name(test-settings)
67-
# This one is fine, but hangs on Travis CI
68-
# add_test_by_name(test-timezone-timedated)
64+
add_test_by_name(test-timezone-timedated)
6965
add_test_by_name(test-utils)
7066

7167
if (ENABLE_LOMIRI_FEATURES)

0 commit comments

Comments
 (0)