tests/sample-test: Update to use test-lib.sh.

diff --git a/tests/sample-test b/tests/sample-test
index 4d962d04331d3aed57da7cdb2f5cde8bbe0cb9ee..ca942934599c15a0fb12c0cf5e06f86a3abebec8 100644 (file)
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -25,29 +25,18 @@ fi
 # FIXME: . $srcdir/../lang-default
 # FIXME: PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
 # FIXME: PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+. $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
-
-if test $framework_failure = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
+# If used, these must *follow* test-lib.sh.
+# FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; }
+# FIXME: . "$abs_top_srcdir/tests/other-fs-tmpdir"
 
 fail=0
-
 FIXME > out || fail=1
 cat <<\EOF > exp || fail=1
 FIXME
 EOF
 
-cmp out exp || fail=1
-test $fail = 1 && diff out exp 2> /dev/null
+compare out exp || fail=1
 
 (exit $fail); exit $fail