[neon/backports-focal/assimp/Neon/unstable] debian/tests: Revert "simplified 'assimp-info' script (and properly check for errors)"

Jonathan Riddell null at kde.org
Thu Dec 16 13:23:59 GMT 2021


Git commit a833fb08820d1aaf1d664670865df9ec3d31a271 by Jonathan Riddell.
Committed on 16/12/2021 at 13:23.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "simplified 'assimp-info' script (and properly check for errors)"

This reverts commit e71a0f9bb324b26cbdc0f646d4cd7e401f2ba031.

M  +10   -12   debian/tests/assimp-info

https://invent.kde.org/neon/backports-focal/assimp/commit/a833fb08820d1aaf1d664670865df9ec3d31a271

diff --git a/debian/tests/assimp-info b/debian/tests/assimp-info
index e3d67f5..839e4bd 100755
--- a/debian/tests/assimp-info
+++ b/debian/tests/assimp-info
@@ -3,18 +3,16 @@
 runtest() {
    echo "===================================================="
    echo "> Trying to open '$1' with assimp"
-   assimp info "$1" 2>&1
+   assimp info "$1" 2>&1 | sed -e '/^ *$/d'
    ret=$?
-   case "${ret}" in
-           0)
-                   ;;
-           5) # assimp failed to open the file, but handled it gracefully
-                   ;;
-           *)
-                   echo "> assimp info '$1' returned $ret"
-                   retval=1
-                   ;;
-   esac
+   if [ "x${ret}" = "x5" ]; then
+      # assimp failed to open the file, but handled it gracefully
+      ret=0
+   fi
+   if [ "x${ret}" != "x0" ]; then
+      echo "> assimp info '$1' returned $ret"
+      retval=1
+   fi
    echo ""
 }
 
@@ -72,6 +70,6 @@ for f in "$@"; do
             fi
         fi
     fi
-    runtest "$f" | sed -e '/^ *$/d'
+    runtest "$f"
 done
 exit $retval



More information about the Neon-commits mailing list