summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-12-07 10:11:40 +0100
committerJim Meyering <jim@meyering.net>2006-12-07 10:11:40 +0100
commit565b165115de72b4b276c0d5d6d5095e3c901a69 (patch)
treed7ba822da206fbb3dc4174f35ce39ff2ce46d25f
parent9f1b96313e8653f1ad5358539776c58fd8fbdaef (diff)
downloadcoreutils-565b165115de72b4b276c0d5d6d5095e3c901a69.tar.xz
* tests/touch/empty-file: Use envvar-check, so "make check" doesn't
evoke diagnostics like this when COLUMNS=0 in the environment: ls: ignoring invalid width in environment variable COLUMNS: 0 * tests/touch/no-rights: Likewise. * tests/help-version: Likewise.
-rw-r--r--ChangeLog5
-rwxr-xr-xtests/help-version2
-rwxr-xr-xtests/touch/empty-file4
-rwxr-xr-xtests/touch/no-rights4
4 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a3de0c91b..43dd1c54f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
2006-12-07 Jim Meyering <jim@meyering.net>
Make the output of "make check" more reproducible.
+ * tests/touch/empty-file: Use envvar-check, so "make check" doesn't
+ evoke diagnostics like this when COLUMNS=0 in the environment:
+ ls: ignoring invalid width in environment variable COLUMNS: 0
+ * tests/touch/no-rights: Likewise.
+ * tests/help-version: Likewise.
* tests/uniq/Test.pm: Don't perform the pipe-reading version of test
118, since it emits "cat: write error: Broken pipe" on some systems.
diff --git a/tests/help-version b/tests/help-version
index 991a1c0b3..c17cc493b 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -28,6 +28,8 @@ test "$VERBOSE" = yes && set -x
test "x$SHELL" = x && SHELL=/bin/sh
export SHELL
+. $srcdir/envvar-check
+
expected_failure_status_nohup=127
expected_failure_status_printenv=2
expected_failure_status_tty=3
diff --git a/tests/touch/empty-file b/tests/touch/empty-file
index 22d857ee1..b918362c8 100755
--- a/tests/touch/empty-file
+++ b/tests/touch/empty-file
@@ -1,7 +1,7 @@
#!/bin/sh
# Make sure touch can set the mtime on an empty file.
-# Copyright (C) 1998, 1999, 2000, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2005, 2006 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
@@ -28,6 +28,8 @@ if test "$VERBOSE" = yes; then
touch --version
fi
+. $srcdir/../envvar-check
+
DEFAULT_SLEEP_SECONDS=2
SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS}
diff --git a/tests/touch/no-rights b/tests/touch/no-rights
index 0d9e3bd86..8faef99bf 100755
--- a/tests/touch/no-rights
+++ b/tests/touch/no-rights
@@ -2,7 +2,7 @@
# Make sure touch can update the times on a file that is neither
# readable nor writable.
-# Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2002, 2006 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
@@ -24,6 +24,8 @@ if test "$VERBOSE" = yes; then
touch --version
fi
+. $srcdir/../envvar-check
+
DEFAULT_SLEEP_SECONDS=2
SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS}