Run QML tests only when is supported

parkouss · Feb 10, 2019 · 33bf357 · 33bf357
1 parent ccd8692
commit 33bf357
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -105,12 +105,4 @@ install:
   - qmake --version                     # check exact Qt version
 
 script:
-  - flake8 client/funq server/funq_server
-  - cd client && $PYTHON setup.py develop && cd ..
-  - cd server && $PYTHON setup.py develop && cd ..
-  - cd server/tests && qmake && make -j4 && cd ../..
-  - cd tests-functionnal/funq-test-app && qmake && make -j4 && cd ../..
-  - cd tests-functionnal/funq-test-qml-app && qmake && make -j4 && cd ../..
-  - cd client && $PYTHON setup.py test; cd ..
-  - make -C server/tests/ check
-  - cd tests-functionnal && nosetests && cd ..
+  - ./ci/build_and_run_tests.sh
diff --git a/ci/build_and_run_tests.sh b/ci/build_and_run_tests.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+flake8 client/funq server/funq_server
+cd client && $PYTHON setup.py develop && cd ..
+cd server && $PYTHON setup.py develop && cd ..
+cd server/tests && qmake && make -j4 && cd ../..
+cd tests-functionnal/funq-test-app && qmake && make -j4 && cd ../..
+
+if [[ "$QT_SELECT" == "5" ]]
+  then
+cd tests-functionnal/funq-test-qml-app && qmake && make -j4 && cd ../..
+fi
+
+cd client && $PYTHON setup.py test; cd ..
+make -C server/tests/ check
+cd tests-functionnal && nosetests && cd ..