From 5755f52a4747be51b61d14acf3feb5b8f2143032 Mon Sep 17 00:00:00 2001 From: Jean Privat Date: Tue, 23 Jun 2015 10:59:14 -0400 Subject: [PATCH] tests: exec.skip and cc.skip are searched in the sav directories Signed-off-by: Jean Privat --- tests/tests.sh | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tests/tests.sh b/tests/tests.sh index 1dc7eaf..66a53a0 100755 --- a/tests/tests.sh +++ b/tests/tests.sh @@ -372,19 +372,25 @@ need_skip() skip_exec() { test "$noskip" = true && return 1 - if echo "$1" | grep -f "exec.skip" >/dev/null 2>&1; then - echo -n "_ " - return 0 - fi + for savdir in $savdirs .; do + f="$savdir/exec.skip" + if echo "$1" | grep -f "$f" >/dev/null 2>&1; then + echo -n "_ no exec by $f; " + return 0 + fi + done return 1 } skip_cc() { test "$noskip" = true && return 1 - if echo "$1" | grep -f "cc.skip" >/dev/null 2>&1; then - return 0 - fi + for savdir in $savdirs .; do + f="$savdir/cc.skip" + if echo "$1" | grep -f "$f" >/dev/null 2>&1; then + return 0 + fi + done return 1 } -- 1.7.9.5