simplify

qgis · Mar 6, 2019 · 07e1d9f · 07e1d9f
1 parent 49248a4
commit 07e1d9f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -172,10 +172,11 @@ popd > /dev/null # /root/QGIS
 ##############################
 # Passing cases:
 echo "QGIS tests runner"
-cd /root/qgis_test_runner && [[ $(./qgis_testrunner.sh test_testrunner.run_passing) -eq '0' ]] && echo "1/5 succeeded" || exit 1
-cd /root/qgis_test_runner && [[ $(./qgis_testrunner.sh test_testrunner.run_skipped_and_passing) -eq '0' ]] && echo "2/5 succeeded"  || exit 1
+pushd /root/qgis_test_runner
+./qgis_testrunner.sh test_testrunner.run_passing && echo "1/5 succeeded" || exit 1
+./qgis_testrunner.sh test_testrunner.run_skipped_and_passing && echo "2/5 succeeded"  || exit 1
 # Failing cases:
-cd /root/qgis_test_runner && [[ $(./qgis_testrunner.sh test_testrunner) -eq '1' ]] && echo "3/5 succeeded"  || exit 1
-cd /root/qgis_test_runner && [[ $(./qgis_testrunner.sh test_testrunner.run_all) -eq '1' ]] && echo "4/5 succeeded"  || exit 1
-cd /root/qgis_test_runner && [[ $(./qgis_testrunner.sh test_testrunner.run_failing) -eq '1' ]] && echo "5/5 succeeded"  || exit 1
+./qgis_testrunner.sh test_testrunner && exit 1 || echo "3/5 succeeded"
+./qgis_testrunner.sh test_testrunner.run_all && exit 1 || echo "5/5 succeeded"
+./qgis_testrunner.sh test_testrunner.run_failing && exit 1 || echo "5/5 succeeded"
 popd
diff --git a/external/qt-unix-signals/sigwatch.cpp b/external/qt-unix-signals/sigwatch.cpp
@@ -108,7 +108,7 @@ void UnixSignalWatcherPrivate::watchForSignal(int signal)
     struct sigaction sigact;
     sigact.sa_handler = UnixSignalWatcherPrivate::signalHandler;
     sigact.sa_flags = 0;
-    ::sigemptyset(&sigact.sa_mask);
+    sigemptyset(&sigact.sa_mask);
     sigact.sa_flags |= SA_RESTART;
     if (::sigaction(signal, &sigact, nullptr)) {
         qDebug() << "UnixSignalWatcher: sigaction: " << ::strerror(errno);