]> granicus.if.org Git - strace/commitdiff
tests: do not skip sched.test if one of its subtests skips
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 15 Mar 2017 01:05:45 +0000 (01:05 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 15 Mar 2017 01:05:45 +0000 (01:05 +0000)
* tests/sched.test (try_run_prog): New function.
Use it instead of run_prog.

tests/sched.test

index d111aa371e9fbff6707b4eaa550f5a8418a452f6..c334660a8f9226d2076a4397d909247cf550cd36 100755 (executable)
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+. "${srcdir=.}/init.sh"
+
+try_run_prog()
+{
+       "$@" > /dev/null || {
+               rc=$?
+               if [ $rc -eq 77 ]; then
+                       return 1
+               else
+                       fail_ "$* failed with code $rc"
+               fi
+       }
+}
+
 SCHED_TESTS='28 sched_xetaffinity
 23 sched_xetparam
 31 sched_rr_get_interval
@@ -39,11 +53,9 @@ NON_SCHED_TESTS='11 fchdir
 28 futex
 10 fsync'
 
-. "${srcdir=.}/init.sh"
-
 echo "$SCHED_TESTS" | while read w i
 do
-       run_prog ./$i > /dev/null
+       try_run_prog "./$i" || continue
        run_strace -a$w -e%sched ./$i > "$EXP"
        match_diff "$LOG" "$EXP"
 done
@@ -52,7 +64,7 @@ echo '+++ exited with 0 +++' > "$EXP"
 
 echo "$NON_SCHED_TESTS" | while read w i
 do
-       run_prog ./$i > /dev/null
+       try_run_prog "./$i" || continue
        run_strace -a$w -e%sched ./$i > /dev/null
        match_diff "$LOG" "$EXP"
 done