diff options
| author | Jim Meyering <jim@meyering.net> | 2007-08-16 16:28:11 +0200 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-09-15 08:40:38 +0200 |
| commit | c840cd4334c086f5ce4d9144d9fac75643824a38 (patch) | |
| tree | d189abc0f2395a2b799ed47ebabf0ef54b06b4df /tests/touch/relative | |
| parent | 7a6a30b8a2dea2a1b49d43ee9ab70880a0aa435a (diff) | |
| download | coreutils-c840cd4334c086f5ce4d9144d9fac75643824a38.tar.xz | |
Parallel "make check" support.
* build-aux/check.mk: New file, from The Vaucanson Group.
* .x-sc_GPL_version: New file, to allow "version 2 or later"
in build-aux/check.mk.
* Makefile.am (EXTRA_DIST): Add .x-sc_GPL_version.
* tests/check.mk: New file.
* tests/Makefile.am (EXTRA_DIST): Add check.mk, mkdtemp and test-lib.sh.
Begin factoring "sample-test" out of test scripts.
* tests/test-lib.sh: New file, to be sourced by all tests that
were previously derived from the "sample-test" template.
* tests/mkdtemp: New file.
* tests/touch/dir-1: Use test-lib.sh.
* tests/touch/empty-file: Likewise.
* tests/touch/fail-diag: Likewise.
* tests/touch/fifo: Likewise.
* tests/touch/no-create-missing: Likewise.
* tests/touch/no-rights: Likewise. Also, don't sleep.
* tests/touch/not-owner: Likewise.
* tests/touch/obsolescent: Likewise.
* tests/touch/read-only: Likewise.
* tests/touch/relative: Likewise.
* tests/touch/Makefile.am: Include $(top_srcdir)/tests/check.mk,
to get the parallel-"make check" bits.
Move a slow test into tests/misc.
* tests/check.mk: Wrapper.
* tests/ls/time-1: Move this file to tests/misc/ls-time.
* tests/misc/ls-time: New file. From tests/ls/time-1.
* tests/ls/Makefile.am (TESTS): Remove time-1.
* tests/misc/Makefile.am (TESTS): Add ls-time.
Diffstat (limited to 'tests/touch/relative')
| -rwxr-xr-x | tests/touch/relative | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/tests/touch/relative b/tests/touch/relative index 925c83473..02dfe9c6c 100755 --- a/tests/touch/relative +++ b/tests/touch/relative @@ -2,7 +2,7 @@ # Demonstrate using a combination of --reference and --date to # set the time of a file back by an arbitrary amount. -# Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 2006-2007 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,16 +22,9 @@ if test "$VERBOSE" = yes; then touch --version fi -. $srcdir/../envvar-check - -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 +. $srcdir/../test-lib.sh framework_failure=0 -mkdir -p $tmp || framework_failure=1 -cd $tmp || framework_failure=1 TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure=1 if test $framework_failure = 1; then @@ -51,7 +44,6 @@ cat <<\EOF > exp || fail=1 2004-01-11 EOF -cmp out exp || fail=1 -test $fail = 1 && diff out exp 2> /dev/null +compare out exp || fail=1 (exit $fail); exit $fail |