diff --git a/linux-tools/acl/acl.sh b/linux-tools/acl/acl.sh index 181ce5ddf..508377230 100755 --- a/linux-tools/acl/acl.sh +++ b/linux-tools/acl/acl.sh @@ -79,7 +79,10 @@ function runtest() #$TESTDIR/run $cmd >$stdout 2>$stderr cd $TESTDIR ./run $cmd >$stdout 2>$stderr - tc_fail_if_bad $? "unexpected response" || return + RC=$? + [ $RC -eq 0 ] && tc_ignore_warnings "Unescaped left brace in regex is deprecated, passed through" + + tc_fail_if_bad $RC "unexpected response" || return cd .. set $(cat $stdout | grep "passed, 0 failed)" | wc -l) [ $1 -eq 1 ] diff --git a/linux-tools/gawk/gawk.sh b/linux-tools/gawk/gawk.sh index bd1dc89e0..f3bffcb26 100755 --- a/linux-tools/gawk/gawk.sh +++ b/linux-tools/gawk/gawk.sh @@ -114,7 +114,11 @@ function runtest() tc_register "$tst" srcdir=. PATH_SEPARATOR=: make -f Makefile.am $tst >$stdout 2>$stderr - tc_pass_or_fail $? + RC=$? + if [ $tst = "fnamedat" ] || [ $tst = "fnarray" ] || [ $tst = "fnarray2" ] || [ $tst = "fnarydel" ] || [ $tst = "fnasgnm" ] || [ $tst = "fnparydl" ] || [ $tst = "funsmnam" ] || [ $tst = "gsubasgn" ] || [ $tst = "parseme" ] || [ $tst = "badargs" ] || [ $tst = "match2" ] && [ $RC -eq 0 ]; then + tc_ignore_warnings "make:" + fi + tc_pass_or_fail $RC rm -f _$tst } diff --git a/linux-tools/libtool/libtool.sh b/linux-tools/libtool/libtool.sh index bd9be9d97..fc77345c4 100755 --- a/linux-tools/libtool/libtool.sh +++ b/linux-tools/libtool/libtool.sh @@ -104,7 +104,9 @@ function test02(){ let TST_TOTAL=$TST_TOTAL+1 tc_register "libtool: linking library: foo.lo, hello.lo --> libhello.la" $LIBTOOL --mode=link --tag=CC $GCC -g -O -o libhello.la foo.lo hello.lo -rpath $TCTMP/libs -lm >$stdout 2>$stderr - tc_pass_or_fail $? "linking library libhello.la failed" + RC=$? + [ $RC -eq 0 ] && tc_ignore_warnings "ar:" + tc_pass_or_fail $RC "linking library libhello.la failed" } # diff --git a/linux-tools/libxml2/libxml2.sh b/linux-tools/libxml2/libxml2.sh index fdbd5cef1..8deb96f60 100755 --- a/linux-tools/libxml2/libxml2.sh +++ b/linux-tools/libxml2/libxml2.sh @@ -55,6 +55,7 @@ function TC_libxml2() if [ $? == 1 ]; then cat /dev/null > $stderr fi + [ $? -eq 0 ] && tc_ignore_multiple_warnings "Missing result file result/errors/" tc_pass_or_fail $? "libxml2 runtest failure" } diff --git a/linux-tools/ltrace/ltrace.sh b/linux-tools/ltrace/ltrace.sh index 0b65f1ba3..0ed9768e8 100755 --- a/linux-tools/ltrace/ltrace.sh +++ b/linux-tools/ltrace/ltrace.sh @@ -137,7 +137,12 @@ function test07() tc_register "ltrace -L -S command" ltrace -L -S ./ltracetest1 &>$stdout tc_fail_if_bad $? "ltrace -L -S command failed" || return - grep -q "open@SYS" $stdout + grep -i "ubuntu" /etc/*-release >/dev/null 2>&1 + if [ $? -eq 0 ];then + grep -q "SYS_open" $stdout + else + grep -q "open@SYS" $stdout + fi tc_pass_or_fail $? "ltrace -L -S command failed" } diff --git a/linux-tools/mlocate/locate.sh b/linux-tools/mlocate/locate.sh index 779432e77..5b73ef947 100755 --- a/linux-tools/mlocate/locate.sh +++ b/linux-tools/mlocate/locate.sh @@ -56,14 +56,25 @@ function tc_local_setup() touch $locate_this # temporarily stop cron process - tc_service_stop_and_wait crond + grep -i "ubuntu" /etc/*-release >/dev/null 2>&1 + rc=$? + if [ $rc -eq 0 ];then + tc_service_stop_and_wait cron + else + tc_service_stop_and_wait crond + fi cron_stopped="yes" return 0 } function tc_local_cleanup() { - [ "$cron_stopped" = "yes" ] && tc_service_start_and_wait crond + if [ $rc -eq 0 ];then + [ "$cron_stopped" = "yes" ] && tc_service_start_and_wait cron + else + [ "$cron_stopped" = "yes" ] && tc_service_start_and_wait crond + fi + } #