From 6ff8e076f39fa34e795cf958442ee228e6e6e29d Mon Sep 17 00:00:00 2001
From: Paul Ferrand <paul@ferrand.cc>
Date: Thu, 29 Oct 2020 09:18:18 +0100
Subject: [PATCH] Do tests on appveyor and merge builds on travis

---
 .appveyor.yml                                 |  4 +-
 .travis.yml                                   | 54 ++++++++-----------
 ...cript_test.sh => script_test_and_build.sh} | 11 +++-
 scripts/appveyor/build.cmd                    |  5 ++
 4 files changed, 38 insertions(+), 36 deletions(-)
 rename .travis/{script_test.sh => script_test_and_build.sh} (55%)
 create mode 100644 scripts/appveyor/build.cmd

diff --git a/.appveyor.yml b/.appveyor.yml
index 9e612363..91693aa9 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -48,7 +48,7 @@ for:
   cache: c:\tools\vcpkg\installed\ -> appveyor.yml
   install:      call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\install.cmd
   before_build: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\before_build.cmd
-  build_script: cmake --build . --config Release -j2
+  build_script: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\build.cmd
   after_build:  call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\after_build.cmd
   artifacts:
   - name: x86 Setup
@@ -60,7 +60,7 @@ for:
   cache: c:\tools\vcpkg\installed\ -> appveyor.yml
   install:      call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\install.cmd
   before_build: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\before_build.cmd
-  build_script: cmake --build . --config Release -j2
+  build_script: call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\build.cmd
   after_build:  call %APPVEYOR_BUILD_FOLDER%\scripts\appveyor\after_build.cmd
   artifacts:
   - name: x64 Setup
diff --git a/.travis.yml b/.travis.yml
index 1e2a0c6e..627b6118 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,17 +19,26 @@ jobs:
     install: .travis/download_vst_sdk.sh
     script: scripts/run_clang_tidy.sh
 
-  - name: "Linux amd64 tests"
+  - name: "Linux amd64 test and build"
     arch: amd64
     addons:
       apt:
         packages:
         - libjack-jackd2-dev
         - libsndfile1-dev
+        - libcairo2-dev
+        - libfontconfig1-dev
+        - libx11-xcb-dev
+        - libxcb-util-dev
+        - libxcb-cursor-dev
+        - libxcb-xkb-dev
+        - libxkbcommon-dev
+        - libxkbcommon-x11-dev
+        - libxcb-keysyms1-dev
     install: .travis/download_cmake.sh
-    script: .travis/script_test.sh
+    script: .travis/script_test_and_build.sh
 
-  - name: "Linux arm64 tests"
+  - name: "Linux arm64 test and build"
     arch: arm64-graviton2
     group: edge
     virt: lxd
@@ -38,8 +47,17 @@ jobs:
         packages:
         - libjack-jackd2-dev
         - libsndfile1-dev
+        - libcairo2-dev
+        - libfontconfig1-dev
+        - libx11-xcb-dev
+        - libxcb-util-dev
+        - libxcb-cursor-dev
+        - libxcb-xkb-dev
+        - libxkbcommon-dev
+        - libxkbcommon-x11-dev
+        - libxcb-keysyms1-dev
     install: .travis/download_cmake.sh
-    script: .travis/script_test.sh
+    script: .travis/script_test_and_build.sh
 
   - name: "MOD devices arm"
     env:
@@ -72,34 +90,6 @@ jobs:
     script: .travis/script_mingw.sh
     after_success: .travis/prepare_tarball.sh
 
-  - name: "Linux amd64 library"
-    arch: amd64
-    env:
-    - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
-    addons:
-      apt:
-        packages:
-        - libjack-jackd2-dev
-        - libsndfile1-dev
-    install: .travis/download_cmake.sh
-    script: .travis/script_library.sh
-    after_success: .travis/prepare_tarball.sh
-
-  - name: "Linux arm64 library"
-    arch: arm64-graviton2
-    group: edge
-    virt: lxd
-    env:
-    - INSTALL_DIR="sfizz-${TRAVIS_BRANCH}-${TRAVIS_OS_NAME}-${TRAVIS_CPU_ARCH}"
-    addons:
-      apt:
-        packages:
-        - libjack-jackd2-dev
-        - libsndfile1-dev
-    install: .travis/download_cmake.sh
-    script: .travis/script_library.sh
-    after_success: .travis/prepare_tarball.sh
-
   - name: "Linux arm64 static plugins"
     arch: arm64-graviton2
     group: edge
diff --git a/.travis/script_test.sh b/.travis/script_test_and_build.sh
similarity index 55%
rename from .travis/script_test.sh
rename to .travis/script_test_and_build.sh
index 8481cbfb..d7b3d6c7 100755
--- a/.travis/script_test.sh
+++ b/.travis/script_test_and_build.sh
@@ -3,12 +3,19 @@ set -ex
 
 mkdir build && cd build
 cmake -DCMAKE_BUILD_TYPE=Release \
-      -DSFIZZ_JACK=OFF \
+      -DSFIZZ_JACK=ON \
+      -DSFIZZ_VST=ON \
+      -DSFIZZ_LV2_UI=ON \
       -DSFIZZ_TESTS=ON \
       -DSFIZZ_SHARED=OFF \
       -DSFIZZ_STATIC_DEPENDENCIES=OFF \
-      -DSFIZZ_LV2=OFF \
+      -DSFIZZ_LV2=ON \
       -DCMAKE_CXX_STANDARD=17 \
       ..
 make -j2 sfizz_tests
 tests/sfizz_tests
+make -j2 sfizz_jack
+make -j2 sfizz_render
+make -j2 sfizz_lv2
+make -j2 sfizz_lv2_ui
+make -j2 sfizz_vst3
diff --git a/scripts/appveyor/build.cmd b/scripts/appveyor/build.cmd
new file mode 100644
index 00000000..94838421
--- /dev/null
+++ b/scripts/appveyor/build.cmd
@@ -0,0 +1,5 @@
+cmake --build . --target sfizz_tests --config Release -j2
+.\tests\Release\sfizz_tests.exe
+cmake --build . --target sfizz_lv2 --config Release -j2
+cmake --build . --target sfizz_lv2_ui --config Release -j2
+cmake --build . --target sfizz_vst3 --config Release -j2