Skip perf for second-order self-hosted tests.

diff --git a/.travis.yml b/.travis.yml
index 38f0ae9..f5001f9 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,10 +53,10 @@ matrix:
     - {env: IMPL=logo NO_SELF_HOST=1,         services: [docker]} # step4 timeout
     - {env: IMPL=lua,                         services: [docker]}
     - {env: IMPL=make NO_SELF_HOST=1,         services: [docker]} # step4 timeout
-    - {env: IMPL=mal MAL_IMPL=js      BUILD_IMPL=js  NO_SELF_HOST=1, services: [docker]}
-    - {env: IMPL=mal MAL_IMPL=js-mal  BUILD_IMPL=js  NO_SELF_HOST=1, services: [docker]}
-    - {env: IMPL=mal MAL_IMPL=nim     BUILD_IMPL=nim NO_SELF_HOST=1, services: [docker]}
-    - {env: IMPL=mal MAL_IMPL=nim-mal BUILD_IMPL=nim NO_SELF_HOST=1, services: [docker]}
+    - {env: IMPL=mal MAL_IMPL=js      BUILD_IMPL=js  NO_SELF_HOST=1,           services: [docker]}
+    - {env: IMPL=mal MAL_IMPL=js-mal  BUILD_IMPL=js  NO_SELF_HOST=1 NO_PERF=1, services: [docker]}
+    - {env: IMPL=mal MAL_IMPL=nim     BUILD_IMPL=nim NO_SELF_HOST=1,           services: [docker]}
+    - {env: IMPL=mal MAL_IMPL=nim-mal BUILD_IMPL=nim NO_SELF_HOST=1 NO_PERF=1, services: [docker]}
     - {env: IMPL=matlab NO_SELF_HOST_PERF=1,  services: [docker]} # Octave, perf timeout
     - {env: IMPL=miniMAL NO_SELF_HOST_PERF=1, services: [docker]} # perf timeout
     - {env: IMPL=nasm NO_SELF_HOST_PERF=1,    services: [docker]} # perf OOM

diff --git a/.travis_test.sh b/.travis_test.sh
index 2c063fa..9c894da 100755 (executable)
--- a/.travis_test.sh
+++ b/.travis_test.sh
@@ -22,15 +22,17 @@ echo "IMPL: ${IMPL}"
 echo "BUILD_IMPL: ${BUILD_IMPL}"
 echo "MAL_IMPL: ${MAL_IMPL}"
 
-if [ "${DO_SELF_HOST}" ]; then
-    if [ "${NO_SELF_HOST}" ]; then
-        echo "Skipping ${ACTION} of ${MAL_IMPL} self-host"
-        exit 0
-    fi
-    if [ "${ACTION}" = "perf" -a "${NO_SELF_HOST_PERF}" ]; then
-        echo "Skipping only perf test for ${MAL_IMPL} self-host"
-        exit 0
-    fi
+if [ "${NO_PERF}" -a "${ACTION}" = "perf" ]; then
+    echo "Skipping perf test"
+    exit 0
+fi
+if [ "${NO_SELF_HOST}" -a "${DO_SELF_HOST}" ]; then
+    echo "Skipping ${ACTION} of ${MAL_IMPL} self-host"
+    exit 0
+fi
+if [ "${NO_SELF_HOST_PERF}" -a "${DO_SELF_HOST}" -a "${ACTION}" = "perf" ]; then
+    echo "Skipping only perf test for ${MAL_IMPL} self-host"
+    exit 0
 fi
 
 mode_var=${MAL_IMPL:-${IMPL}}_MODE