From f5654a178b70633f5c80e06670d56d9b52b83af5 Mon Sep 17 00:00:00 2001
From: Anh <zenpoems@gmail.com>
Date: Wed, 21 Nov 2018 19:21:29 -0800
Subject: [PATCH] Rename config to expect_fail
Former-commit-id: f059673735107a35e09f9fe57dc27f6c35476756
---
cicd_tests/verify-fails.sh | 4 ++--
tests/test_cmds.sh | 29 +++++++++++++++++++----------
2 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/cicd_tests/verify-fails.sh b/cicd_tests/verify-fails.sh
index 4eb13f0e7..a6cae1e3e 100755
--- a/cicd_tests/verify-fails.sh
+++ b/cicd_tests/verify-fails.sh
@@ -9,8 +9,8 @@ cd $PEASOUP_HOME/tests
make clean
# verify "fail" configuration
-./test_cmds.sh -l -c fail -a ls
-./test_cmds.sh -l -c fail -a grep
+./test_cmds.sh -l -c expect_fail -a ls
+./test_cmds.sh -l -c expect_fail -a grep
exit 0
diff --git a/tests/test_cmds.sh b/tests/test_cmds.sh
index 84fd9c9ed..69ccad532 100755
--- a/tests/test_cmds.sh
+++ b/tests/test_cmds.sh
@@ -162,7 +162,7 @@ do_tests()
orig)
cp $progpath $protected
;;
- fail)
+ expect_fail)
set -x
base_prog=$(basename $progpath)
if [ $base_prog = "ls" ]; then
@@ -195,13 +195,24 @@ do_tests()
echo "TEST ($config) ${prog}: Running tests..."
TEST_VERBOSE=1 timeout 300 ../$prog/test_script.sh $progpath ./$protected > test_${prog}.log 2>&1
if [ $? -eq 0 ]; then
- echo "TEST ($config) ${prog}: PASS"
- progs_pass="$progs_pass $prog.$config"
+ if [ "$config" != "fail" ]; then
+ echo "TEST ($config) ${prog}: PASS"
+ progs_pass="$progs_pass $prog.$config"
+ else
+ progs_fail="$progs_fail $prog.$config"
+ if [ $show_logs_on_failure -eq 1 ]; then
+ cat test_${prog}.log
+ fi
+ fi
else
- echo "TEST ($config) ${prog}: FAIL"
- progs_fail="$progs_fail $prog.$config"
- if [ $show_logs_on_failure -eq 1 ]; then
- cat test_${prog}.log
+ if [ "$config" != "fail" ]; then
+ echo "TEST ($config) ${prog}: FAIL"
+ progs_fail="$progs_fail $prog.$config"
+ if [ $show_logs_on_failure -eq 1 ]; then
+ cat test_${prog}.log
+ fi
+ else
+ progs_pass="$progs_pass $prog.$config"
fi
fi
done
@@ -218,9 +229,7 @@ do_tests()
done
if [[ $progs_fail != "" ]] || [[ $progs_fail_peasoup != "" ]]; then
- if [[ $config != "fail" ]]; then
- had_fails=1
- fi
+ had_fails=1
fi
}
--
GitLab