Fix test for dists

- make oauth dependecy conditional on integration tests - fix comment on return code 99 (ERROR) for test scripts Signed-off-by: Andreas Fuchs <[email protected]>
tpm2-software · Feb 22, 2019 · 44fcb68 · 44fcb68
1 parent 6949018
commit 44fcb68
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/configure.ac b/configure.ac
@@ -75,7 +75,6 @@ AS_IF([test "x$enable_debug" != "xno"],
 PKG_PROG_PKG_CONFIG([0.25])
 PKG_CHECK_MODULES([TSS2_ESYS],[tss2-esys])
 PKG_CHECK_MODULES([QRENCODE],[libqrencode])
-PKG_CHECK_MODULES([OATH],[liboath])
 
 AC_PATH_PROG([PANDOC], [pandoc])
 AS_IF([test -z "$PANDOC"],
@@ -89,6 +88,7 @@ AC_ARG_ENABLE([integration],
             [enable_integration=$enableval],
             [enable_integration=no])
 AM_CONDITIONAL([INTEGRATION], [test "x$enable_integration" != xno])
+AS_IF([test "x$enable_integration" != xno], [PKG_CHECK_MODULES([OATH],[liboath])])
 
 AC_OUTPUT
 

diff --git a/test/tpm2-totp.sh b/test/tpm2-totp.sh
@@ -24,12 +24,12 @@ function prereq()
 {
     if [ -f NVChip ]; then
         echo "There is a leftover file NVChip in the test directory."
-        return 99 #XFAIL
+        return 99 #ERROR
     fi
 
     if killall -0 $(basename $TPMSIM); then
         echo "There is already a tpm_simulator running."
-        return 99 #XFAIL
+        return 99 #ERROR
     fi
 
     trap "cleanup" EXIT