]> granicus.if.org Git - openjpeg/commitdiff
Travis fix error when no tests are done
authormayeut <mayeut@users.noreply.github.com>
Sat, 12 Sep 2015 18:06:31 +0000 (20:06 +0200)
committermayeut <mayeut@users.noreply.github.com>
Sat, 12 Sep 2015 18:06:31 +0000 (20:06 +0200)
tools/travis-ci/run.sh

index c68d2da2b035132410b8f223aac2c2bb6299a747..ec3b7d345d0518616be3285257b17c7dc206bee8 100755 (executable)
@@ -131,26 +131,34 @@ Parsing logs for new/unknown failures
 "
 OPJ_CI_RESULT=0
 
-awk -F: '{ print $2 }' build/Testing/Temporary/LastTestsFailed_*.log > failures.txt
-
-while read FAILEDTEST; do
-       # Start with common errors
-       if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-all.txt > /dev/null; then
-               continue
-       fi
-       if [ -f ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt ]; then
-               if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt > /dev/null; then
+OPJ_HAS_TESTS=$(find build -path 'build/Testing/Temporary*' -name 'LastTestsFailed*' | wc -l)
+OPJ_HAS_TESTS=$(echo $OPJ_HAS_TESTS) #macos wc workaround
+
+if [ $OPJ_HAS_TESTS -ne 0 ]; then
+       awk -F: '{ print $2 }' build/Testing/Temporary/LastTestsFailed_*.log > failures.txt
+       while read FAILEDTEST; do
+               # Start with common errors
+               if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-all.txt > /dev/null; then
                        continue
                fi
-       fi
-       echo "${FAILEDTEST}"
-       OPJ_CI_RESULT=1
-done < failures.txt
+               if [ -f ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt ]; then
+                       if grep -x "${FAILEDTEST}" ${OPJ_SOURCE_DIR}/tools/travis-ci/knownfailures-${OPJ_BUILDNAME_TEST}.txt > /dev/null; then
+                               continue
+                       fi
+               fi
+               echo "${FAILEDTEST}"
+               OPJ_CI_RESULT=1
+       done < failures.txt
+fi
 
 # TODO parse memcheck
 
 if [ ${OPJ_CI_RESULT} -eq 0 ]; then
        echo "No new/unknown failure found"
+else
+       echo "
+New/unknown failures found!!!
+"
 fi
 
 exit ${OPJ_CI_RESULT}