travis: no rpm check for all matrix tests

diff --git a/.travis.yml b/.travis.yml
index dfb4a6161f0d8d5ade3ef8dfb6ef4136cdf67249..075cbc6a34ff9ff4ba2bcfb45a6c096b8d52ffce 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,12 +4,12 @@ services:
 - docker
 env:
   matrix:
-  - IMAGE=latest  TESTS="01 02 03 04 10 11"
-  - IMAGE=latest  TESTS="12 13 15 17 18"
+  - IMAGE=latest
+  - IMAGE=latest  TESTS="01 02 03 04 10 11 12"
+  - IMAGE=latest  TESTS="13 15 17 18"
   - IMAGE=latest  TESTS=20
-  - IMAGE=latest  TESTS="30 31"
-  - IMAGE=latest  TESTS=50
-  - IMAGE=latest  TESTS="70 99"
+  - IMAGE=latest  TESTS="30 31 99"
+  - IMAGE=latest  TESTS="50 70"
 
 before_script:
   - docker pull fedora:$IMAGE

diff --git a/fedora-test.sh b/fedora-test.sh
index af38bc33490f2a868a0a1758fc83958af8bb35f2..87023a840c2417a49ed1a2bb89084a622cc40070 100755 (executable)
--- a/fedora-test.sh
+++ b/fedora-test.sh
@@ -45,13 +45,17 @@ dnf -y install --best --allowerasing \
 
 NCPU=$(getconf _NPROCESSORS_ONLN)
 
-make -j$NCPU all syncheck rpm logtee
-
-cd test
-
-time sudo make \
-     KVERSION=$(rpm -qa kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' | sort -rn | head -1) \
-     TEST_RUN_ID=$RUN_ID \
-     ${TESTS:+TESTS="$TESTS"} \
-     -k V=2 \
-     check
+if ! [[ $TESTS ]]; then
+    make -j$NCPU all syncheck rpm logtee
+else
+    make -j$NCPU all logtee
+
+    cd test
+
+    time sudo make \
+         KVERSION=$(rpm -qa kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' | sort -rn | head -1) \
+         TEST_RUN_ID=$RUN_ID \
+         ${TESTS:+TESTS="$TESTS"} \
+         -k V=2 \
+         check
+fi