Fix test dependency installation

src/build-scripts/common-test-args.hxml

@@ -1,4 +1,3 @@
-src/build-scripts/common-args.hxml
 -lib utest
 -D test
 --main test.TestMain

src/build-scripts/cpp/test.hxml

@@ -1,4 +1,3 @@
-src/build-scripts/common-test-args.hxml
 -lib hxcpp
 -cpp bin/cpp/test
 -cmd bash src/build-scripts/cpp/test-cpp.sh

src/build-scripts/interp/test.hxml

@@ -1,2 +1 @@
-src/build-scripts/common-test-args.hxml
 --interp

src/build-scripts/js/test.hxml

@@ -1,3 +1,2 @@
-src/build-scripts/common-test-args.hxml
 --js bin/js/test.js
 --cmd node bin/js/test.js

src/build-scripts/nodejs/test.hxml

@@ -1,4 +1,3 @@
-src/build-scripts/common-test-args.hxml
 -lib hxnodejs
 --js bin/nodejs/test.js
 --cmd node bin/nodejs/test.js

src/build-scripts/py/test-py.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-# Travis testing on Xenial
+# "python" is supposed to mean Python3 everywhere now, but not in practice
-if [ "$(uname)" = "Linux" ]; then
+if [ ! -z "$(which python3)" ]; then
     python3 bin/py/test.py
 else
     python bin/py/test.py

src/build-scripts/py/test.hxml

@@ -1,3 +1,2 @@
-src/build-scripts/common-test-args.hxml
 --python bin/py/test.py
 --cmd bash src/build-scripts/py/test-py.sh

test-all.sh

@@ -1,8 +1,13 @@
 #! /bin/bash
+
+# For local testing. Dependencies won't be installed
+
 TEST_FILES=src/build-scripts/**/test.hxml
+
 for TEST_FILE in $TEST_FILES
 do
-	haxe $TEST_FILE
+    echo $TEST_FILE
+    haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml $TEST_FILE
     if [ ! $? -eq 0 ]
     then
         exit $?

test.sh

@@ -3,10 +3,11 @@
 HISS_TARGET=${HISS_TARGET:-$1}
 HISS_TARGET=${HISS_TARGET:-interp}
 
+# For CI tests, force install the dependencies
 if [ ! -z "$TRAVIS_OS_NAME" ]
 then
-    (cd src/build-scripts && haxelib install all)
+    (cd src/build-scripts && haxelib install all --always)
-    (cd src/build-scripts/$HISS_TARGET && haxelib install all)
+    (cd src/build-scripts/$HISS_TARGET && haxelib install all --always)
 fi
 
-haxe src/build-scripts/$HISS_TARGET/test.hxml
+haxe src/build-scripts/common-args.hxml src/build-scripts/common-test-args.hxml src/build-scripts/$HISS_TARGET/test.hxml