Skip to content

Commit 11ac9b3

Browse files
committed
test
Signed-off-by: Patrizio Bekerle <[email protected]>
1 parent 32b318e commit 11ac9b3

File tree

2 files changed

+29
-16
lines changed

2 files changed

+29
-16
lines changed

.github/workflows/build-test.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ jobs:
3737
strategy:
3838
fail-fast: false
3939
matrix:
40-
os: [ubuntu-latest, macos-15, windows-2025]
40+
# os: [ubuntu-latest, macos-15, windows-2025]
41+
os: [windows-2025]
4142
# Linux: https://download.qt.io/online/qtsdkrepository/linux_x64/desktop/
4243
# macOS: https://download.qt.io/online/qtsdkrepository/mac_x64/desktop/
4344
# Windows: https://download.qt.io/online/qtsdkrepository/windows_x86/desktop/
@@ -218,6 +219,7 @@ jobs:
218219
- if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '5.' )
219220
name: Do Qt5 / Qt 6.2.4 Windows tests
220221
run: |
222+
set -o pipefail
221223
cd ..\tests
222224
qmake DEFINES+=INTEGRATION_TESTS
223225
make
@@ -232,21 +234,23 @@ jobs:
232234
# cd ..\bin\tests
233235
# echo test1
234236
# .\tests.exe -txt
235-
# echo windeployqt
237+
# echo windeployqt
236238
windeployqt --debug tests.exe
237239
# echo test2
238240
.\tests.exe -txt
239-
# - if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' )
240-
# name: Do Qt 6.3+ Windows tests
241-
# run: |
242-
# cd ..\tests
243-
# qmake6 DEFINES+=INTEGRATION_TESTS
244-
# nmake
245-
# copy ..\build-systems\github\windows\libcrypto-1_1-x64.dll .
246-
# copy ..\build-systems\github\windows\libssl-1_1-x64.dll .
247-
# copy ..\bin\tests\tests.exe .
248-
# windeployqt --debug tests.exe
249-
# .\tests.exe -txt
241+
- if: contains( matrix.os, 'windows') && startsWith( matrix.qt-version, '6.' )
242+
name: Do Qt 6.3+ Windows tests
243+
run: |
244+
set -o pipefail
245+
cd ..\tests
246+
qmake6 DEFINES+=INTEGRATION_TESTS
247+
nmake
248+
copy ..\build-systems\github\windows\libcrypto-1_1-x64.dll .
249+
copy ..\build-systems\github\windows\libssl-1_1-x64.dll .
250+
Get-ChildItem -Recurse -Force ..
251+
copy ..\bin\tests\tests.exe .
252+
windeployqt --debug tests.exe
253+
.\tests.exe -txt
250254
251255
#
252256
# Build QOwnNotes

tests/unit_tests/testcases/app/app-tests.pri

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
21
APP_SRC_DIR = $$PWD/../../../../src/
32

43
INCLUDEPATH += $$APP_SRC_DIR
54

65
HEADERS += \
7-
$$PWD/test_*.h \
6+
$$PWD/test_htmlentities.h \
7+
$$PWD/test_metricsservice.h \
8+
$$PWD/test_network.h \
9+
$$PWD/test_notes.h \
10+
$$PWD/test_settingsservice.h \
11+
$$PWD/test_utilsmisc.h \
812
$$APP_SRC_DIR/version.h \
913
$$APP_SRC_DIR/release.h \
1014
$$APP_SRC_DIR/services/databaseservice.h \
@@ -49,7 +53,12 @@ HEADERS += \
4953
$$APP_SRC_DIR/threads/scriptthread.h \
5054

5155
SOURCES += \
52-
$$PWD/test_*.cpp \
56+
$$PWD/test_htmlentities.cpp \
57+
$$PWD/test_metricsservice.cpp \
58+
$$PWD/test_network.cpp \
59+
$$PWD/test_notes.cpp \
60+
$$PWD/test_settingsservice.cpp \
61+
$$PWD/test_utilsmisc.cpp \
5362
$$APP_SRC_DIR/services/databaseservice.cpp \
5463
$$APP_SRC_DIR/api/noteapi.cpp \
5564
$$APP_SRC_DIR/api/notesubfolderapi.cpp \

0 commit comments

Comments
 (0)