more tests requirements

tests/testall.sh

@@ -1,50 +1,18 @@
 #!/bin/sh
-# requires mingw64-gcc, gcab, msitools, libgsf, libgsf-devel
+# mingw64-gcc, gcab, msitools, libgsf, libgsf-devel
+# vim-common, libfaketime packages are required
 
-result=0
+result=1
+count=0
+skip=0
+fail=0
 
 result_path=$(pwd)
 cd $(dirname "$0")
 script_path=$(pwd)
 result_path="${result_path}/logs"
 
-rm -rf "${result_path}"
+make_tests() {
-mkdir "${result_path}"
-cd "${result_path}"
-
-date > "results.log"
-../../osslsigncode -v >> "results.log" 2>/dev/null
-
-if [ -n "$(command -v x86_64-w64-mingw32-gcc)" ]
-  then
-    x86_64-w64-mingw32-gcc "../myapp.c" -o "test.exe" 2>> "results.log" 1>&2
-  else
-    printf "%s\n" "x86_64-w64-mingw32-gcc not found in \$PATH"
-    printf "%s\n" "tests for PE files skipped, please install mingw64-gcc package"
-  fi
-if [ -n "$(command -v gcab)" ]
-  then
-    gcab -c "test.ex_" "test.exe" 2>> "results.log" 1>&2
-  else
-    printf "%s\n" "gcab not found in \$PATH"
-    printf "%s\n" "tests for CAB files skipped, please install gcab package"
-  fi
-if grep -o "no libgsf available" "results.log"
-  then
-    printf "%s\n" "signing MSI files requires libgsf/libgsf-devel packages and reconfiguration osslsigncode"
-  else
-    if [ -n "$(command -v wixl)" ]
-      then
-        touch FoobarAppl10.exe
-        cp "../sample.wxs" "sample.wxs" 2>> "results.log" 1>&2
-        wixl -v "sample.wxs" 2>> "results.log" 1>&2
-      else
-        printf "%s\n" "wixl not found in \$PATH"
-        printf "%s\n" "tests for MSI files skipped, please install msitools package"
-      fi
-  fi
-if [ -n "$(command -v faketime)" ]
-  then
   for plik in ${script_path}/recipes/*
     do
       /bin/sh $plik 3>&1 2>> "results.log" 1>&2
@@ -59,10 +27,68 @@ if [ -n "$(command -v faketime)" ]
     else # no test was done
       result=1
     fi
+}
+
+rm -rf "${result_path}"
+mkdir "${result_path}"
+cd "${result_path}"
+
+date > "results.log"
+../../osslsigncode -v >> "results.log" 2>/dev/null
+
+# PE and CAB files support
+if [ -n "$(command -v x86_64-w64-mingw32-gcc)" ]
+  then
+    x86_64-w64-mingw32-gcc "../myapp.c" -o "test.exe" 2>> "results.log" 1>&2
+    if [ -n "$(command -v gcab)" ]
+      then
+        gcab -c "test.ex_" "test.exe" 2>> "results.log" 1>&2
+      else
+        printf "%s\n" "gcab not found in \$PATH"
+        printf "%s\n" "tests for CAB files skipped, please install gcab package"
+      fi
+  else
+    printf "%s\n" "x86_64-w64-mingw32-gcc not found in \$PATH"
+    printf "%s\n" "tests for PE files skipped, please install mingw64-gcc package"
+  fi
+
+# MSI files support
+if grep -q "no libgsf available" "results.log"
+  then
+    printf "%s\n" "signing MSI files requires libgsf/libgsf-devel packages and reconfiguration osslsigncode"
+  else
+    if [ -n "$(command -v wixl)" ]
+      then
+        touch FoobarAppl10.exe
+        cp "../sample.wxs" "sample.wxs" 2>> "results.log" 1>&2
+        wixl -v "sample.wxs" 2>> "results.log" 1>&2
+      else
+        printf "%s\n" "wixl not found in \$PATH"
+        printf "%s\n" "tests for MSI files skipped, please install msitools package"
+      fi
+  fi
+
+# Timestamping support
+if grep -q "no libcurl available" "results.log"
+  then
+    printf "%s\n" "configure --with_curl is required for timestamping support"
+  fi
+
+# Tests requirements
+if [ -n "$(command -v faketime)" ]
+  then
+    if [ -n "$(command -v xxd)" ]
+      then
+        make_tests
+        result=$?
         rm -f "test.exe" "test.ex_" "sample.msi" "sample.wxs" "FoobarAppl10.exe"
         rm -f "sign_pe.pem" "sign_msi.pem" "verify.log"
+      else
+        printf "%s\n" "xxd not found in \$PATH"
+        printf "%s\n" "tests skipped, please install vim-common package"
+      fi
   else
     printf "%s\n" "faketime not found in \$PATH"
-    printf "%s\n" "tests for PE files skipped, please install faketime package"
+    printf "%s\n" "tests skipped, please install faketime package"
   fi
 exit $result