From c465b2ee0e5791891866d2be42f87b2bcbf7ab35 Mon Sep 17 00:00:00 2001 From: Eugene Syromyatnikov Date: Fri, 17 Mar 2017 21:04:03 +0100 Subject: [PATCH] tests: move try_run_prog to init.sh Looks like try_run_prog may be of general use by other syscall class tests. * tests/sched.test (try_run_prog): Move it... * tests/init: ... here. --- tests/init.sh | 14 ++++++++++++++ tests/sched.test | 14 -------------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tests/init.sh b/tests/init.sh index f368b98a..24a523e8 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -72,6 +72,20 @@ run_prog_skip_if_failed() "$@" || framework_skip_ "$args failed with code $?" } +try_run_prog() +{ + local rc + + "$@" > /dev/null || { + rc=$? + if [ $rc -eq 77 ]; then + return 1 + else + fail_ "$* failed with code $rc" + fi + } +} + run_strace() { > "$LOG" || fail_ "failed to write $LOG" diff --git a/tests/sched.test b/tests/sched.test index 3837d8c7..a62f7868 100755 --- a/tests/sched.test +++ b/tests/sched.test @@ -29,20 +29,6 @@ . "${srcdir=.}/init.sh" -try_run_prog() -{ - local rc - - "$@" > /dev/null || { - rc=$? - if [ $rc -eq 77 ]; then - return 1 - else - fail_ "$* failed with code $rc" - fi - } -} - while read w i do try_run_prog "./$i" || continue -- 2.50.1