diff options
| author | Jim Meyering <jim@meyering.net> | 2007-01-24 00:34:54 +0100 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2007-01-24 00:34:54 +0100 |
| commit | 124adb3a19cacbf41c236d47a19cb389bb815c01 (patch) | |
| tree | 519dd6f4b075b43b92c1f02d69aaf944d45c40da | |
| parent | 054defae19cf5245f753b06c1cda57ea9709cbef (diff) | |
| download | coreutils-124adb3a19cacbf41c236d47a19cb389bb815c01.tar.xz | |
Don't depend on "which".
* tests/misc/sort-compress (SORT): Use $abs_builddir, now which.
* tests/misc/Makefile.am (TESTS_ENVIRONMENT): Export top_builddir.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | tests/misc/Makefile.am | 4 | ||||
| -rwxr-xr-x | tests/misc/sort-compress | 2 |
3 files changed, 9 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2007-01-24 Jim Meyering <jim@meyering.net> + + Don't depend on "which". + * tests/misc/sort-compress (SORT): Use $abs_builddir, now which. + * tests/misc/Makefile.am (TESTS_ENVIRONMENT): Export top_builddir. + 2007-01-24 Dan Hipschman <dsh@linux.ucla.edu> Test sort compression. diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am index 9950bafda..28503186e 100644 --- a/tests/misc/Makefile.am +++ b/tests/misc/Makefile.am @@ -1,7 +1,6 @@ # Make miscellaneous coreutils tests. -*-Makefile-*- -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 200-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,6 +21,7 @@ EXTRA_DIST = $(TESTS) TESTS_ENVIRONMENT = \ top_srcdir=$(top_srcdir) \ + top_builddir=$(top_builddir) \ srcdir=$(srcdir) \ PACKAGE_VERSION=$(PACKAGE_VERSION) \ PERL="$(PERL)" \ diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress index 79970807b..7e92fe59c 100755 --- a/tests/misc/sort-compress +++ b/tests/misc/sort-compress @@ -33,7 +33,7 @@ mkdir -p $tmp || framework_failure=1 cd $tmp || framework_failure=1 seq -w 2000 > exp || framework_failure=1 tac exp > in || framework_failure=1 -SORT=`which sort` || framework_failure=1 +SORT=$top_builddir/src/sort if test $framework_failure = 1; then echo "$0: failure in testing framework" 1>&2 |