From 19c79040308fcbf6765f1b4d38569229d5998a66 Mon Sep 17 00:00:00 2001 From: Fabian Arrotin Date: Jul 02 2020 11:35:58 +0000 Subject: Merge pull request #58 from alexiri/t_log-fix Fix calls to t_Log --- diff --git a/tests/p_mdadm/5-test_mdadm.sh b/tests/p_mdadm/5-test_mdadm.sh index 782d272..ca3d5f8 100755 --- a/tests/p_mdadm/5-test_mdadm.sh +++ b/tests/p_mdadm/5-test_mdadm.sh @@ -12,4 +12,4 @@ MDADM=`which mdadm` # even with no meta devices available, this should still return a 0 exit status ${MDADM} --detail --scan &>/dev/null -[ $? -eq 0 ] || { t_log "mdadm exited with non-zero status. That ain't good..."; exit $FAIL; } +[ $? -eq 0 ] || { t_Log "mdadm exited with non-zero status. That ain't good..."; exit $FAIL; } diff --git a/tests/p_strace/5-test_strace.sh b/tests/p_strace/5-test_strace.sh index 64ecaf9..551484a 100755 --- a/tests/p_strace/5-test_strace.sh +++ b/tests/p_strace/5-test_strace.sh @@ -5,8 +5,8 @@ t_Log "Running $0 - checking strace runs and returns non-zero exit status." STRACE=`which strace` -[ "$STRACE" ] || { t_log "Failed to find strace. Cannot continue."; exit $FAIL; } +[ "$STRACE" ] || { t_Log "Failed to find strace. Cannot continue."; exit $FAIL; } $STRACE ls &>/dev/null -[ $? -eq 0 ] || { t_log "Strace exited with non-zero status. That ain't good..."; exit $FAIL; } +[ $? -eq 0 ] || { t_Log "Strace exited with non-zero status. That ain't good..."; exit $FAIL; } diff --git a/tests/p_tar/10-tar-test.sh b/tests/p_tar/10-tar-test.sh index bef7717..660a2c6 100755 --- a/tests/p_tar/10-tar-test.sh +++ b/tests/p_tar/10-tar-test.sh @@ -23,7 +23,7 @@ tar -c $TARDIR -f /var/tmp/tarfile.tar > /dev/null 2>&1 /bin/rm -rf $TARDIR if [ -e $TARDIR ] then - t_log "something went wrong with deleting $TARDIR" + t_Log "something went wrong with deleting $TARDIR" exit fi diff --git a/tests/p_zip/10-zip-test.sh b/tests/p_zip/10-zip-test.sh index 791ddc9..959c1ef 100755 --- a/tests/p_zip/10-zip-test.sh +++ b/tests/p_zip/10-zip-test.sh @@ -23,7 +23,7 @@ zip -q /var/tmp/testfile.zip $ZIPDIR/* /bin/rm -rf $ZIPDIR if [ -e $ZIPDIR ] then - t_log "something went wrong with deleting $ZIPDIR" + t_Log "something went wrong with deleting $ZIPDIR" exit fi