From cb6089614a5fb65e8732be478f22fc971435cc01 Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Tue, 17 Nov 2020 15:45:16 -0700
Subject: [PATCH] Fix project testing for Travis

---
 .travis.yml | 10 +---------
 test.sh     | 17 +++++++++++------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f5957d6..9f6de72f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ env:
   - KISS_TARGET=js
   - KISS_TARGET=nodejs
   - KISS_TARGET=py
+  - KISS_TARGET=projects
 
 jobs:
   # Allow Haxe development to fail.
@@ -24,15 +25,6 @@ jobs:
     - script: haxelib install formatter && haxelib run formatter --check -s .
       os: linux
       haxe: stable
-    # Test experiments in separate job
-    - script: KISS_HEADLESS=true ./test-projects.sh
-      os:
-        - mac
-        - linux
-        - windows
-      haxe: stable
-      env:
-        - KISS_TARGET=projects 
 
 install:
   - if [ "${TRAVIS_OS_NAME}" = "windows" ]; then
diff --git a/test.sh b/test.sh
index 0a6af0cb..3faae1c1 100755
--- a/test.sh
+++ b/test.sh
@@ -3,11 +3,16 @@
 KISS_TARGET=${KISS_TARGET:-$1}
 KISS_TARGET=${KISS_TARGET:-interp}
 
-# For CI tests, force install the dependencies
-if [ ! -z "$TRAVIS_OS_NAME" ]
+if [ "$KISS_TARGET" = "projects" ]
 then
-    (cd src/build-scripts && haxelib install all --always)
-    (cd src/build-scripts/$KISS_TARGET && haxelib install all --always)
-fi
+    KISS_HEADLESS="$TRAVIS_OS_NAME" ./test-projects.sh
+else
+    # For CI tests, force install the dependencies
+    if [ ! -z "$TRAVIS_OS_NAME" ]
+    then
+        (cd src/build-scripts && haxelib install all --always)
+        (cd src/build-scripts/$KISS_TARGET && haxelib install all --always)
+    fi
 
-haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$KISS_TARGET/test.hxml
\ No newline at end of file
+    haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$KISS_TARGET/test.hxml
+fi
\ No newline at end of file