File tree Expand file tree Collapse file tree 2 files changed +59
-4
lines changed
Expand file tree Collapse file tree 2 files changed +59
-4
lines changed Original file line number Diff line number Diff line change @@ -9,7 +9,8 @@ dist: trusty
99
1010env :
1111 global :
12- - LPIEDITORPATH=source/project/tracker_editor
12+ - LPI_EDITOR_PATH=source/project/tracker_editor
13+ - LPI_UNIT_TEST_PATH=source/project/unit_test
1314 - WINEPREFIX=~/.winelaz
1415 - DISPLAY=:99.0
1516
@@ -22,18 +23,32 @@ matrix:
2223 env : LAZ_VER=1.6.2
2324 - os : osx
2425 env : LAZ_VER=1.6.2
26+ osx_image : xcode8.3
2527
2628
2729before_install :
28- # Start virtual display server
30+ # Start virtual display server
2931 - Xvfb $DISPLAY &
3032
3133install :
32- # Install prerequisites (fpc/lazarus/wine/qemu)
34+ # Install prerequisites (fpc/lazarus/wine/qemu)
3335 - ./travis-lazarus/.travis.install.py
3436
37+ # install openSSL on macOS
38+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
39+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install openssl; fi
40+ # - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sudo brew link openssl --force; fi
41+ - if [ "$TRAVIS_OS_NAME" = "osx" ]; then openssl version; fi
42+
3543script :
36- - lazbuild $LAZ_OPT $LPIEDITORPATH/trackereditor.lpi # Build trackereditor project
44+ # Build trackereditor project
45+ - lazbuild $LAZ_OPT $LPI_EDITOR_PATH/trackereditor.lpi
46+
47+ # Build unit test project
48+ - lazbuild $LAZ_OPT $LPI_UNIT_TEST_PATH/tracker_editor_test.lpi
49+
50+ # Start the unit test
51+ - source ./scripts/travis_unit_test.sh
3752
3853before_deploy :
3954 - source ./scripts/travis_deploy.sh
Original file line number Diff line number Diff line change 1+ #! /bin/bash
2+
3+ # Run unit test in Windows, Linux and macOS
4+
5+
6+ # ----------- check for Windows, Linux and macOS build
7+ if [ " $TRAVIS_OS_NAME " = " linux" ]
8+ then
9+
10+ # wine = windows
11+ if [ " $LAZ_ENV " = " wine" ]
12+ then
13+
14+ # windows
15+ # does not work.
16+ # wine enduser/test_trackereditor.exe -a --format=plain
17+
18+ # Will exit with status of last command.
19+ exit
20+
21+ else
22+
23+ # linux
24+ enduser/test_trackereditor -a --format=plain
25+
26+ # Will exit with status of last command.
27+ exit
28+
29+ fi
30+
31+ elif [ " $TRAVIS_OS_NAME " = " osx" ]
32+ then
33+ # macOS
34+ # does not work.
35+ # enduser/test_trackereditor -a --format=plain
36+
37+ # Will exit with status of last command.
38+ exit
39+
40+ fi
You can’t perform that action at this time.
0 commit comments