From 03a08a4cd0540cd6b018c5c9f602a1d25847ba62 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sat, 8 Sep 2007 12:26:55 +0200 Subject: Convert tests/misc/ to use test-lib.sh, too. --- tests/misc/runcon-no-reorder | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'tests/misc/runcon-no-reorder') diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder index 42828852c..0fda3b442 100755 --- a/tests/misc/runcon-no-reorder +++ b/tests/misc/runcon-no-reorder @@ -22,25 +22,12 @@ if test "$VERBOSE" = yes; then fi . $srcdir/../lang-default +. $srcdir/../test-lib.sh -pwd=`pwd` -t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$ -trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0 -trap '(exit $?); exit $?' 1 2 13 15 - -framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 - -cat <<\EOF > exp || framework_failure=1 +cat <<\EOF > exp || framework_failure runcon: runcon may be used only on a SELinux kernel EOF -if test $framework_failure = 1; then - echo "$0: failure in testing framework" 1>&2 - (exit 1); exit 1 -fi - fail=0 # This test works even on systems without SELinux. @@ -49,7 +36,6 @@ fail=0 # about -j being an invalid option. runcon -t unconfined_t true -j 2> out && : > exp -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail -- cgit v1.2.3-70-g09d2