diff options
| -rw-r--r-- | tests/.env-warn | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 12 | ||||
| -rw-r--r-- | tests/envvar-check | 2 |
3 files changed, 4 insertions, 18 deletions
diff --git a/tests/.env-warn b/tests/.env-warn deleted file mode 100644 index a94d814e7..000000000 --- a/tests/.env-warn +++ /dev/null @@ -1,8 +0,0 @@ - ***************************** WARNING ************************************ - - You seem to have set the %% environment variable, - this might cause some of the tests in this package to fail. - If any test fails, clear %% from the environment, - and rerun all tests. - - ***************************** WARNING ************************************ diff --git a/tests/Makefile.am b/tests/Makefile.am index 8cdb6a79d..1fdb71b71 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -14,7 +14,7 @@ TESTS_ENVIRONMENT = \ PATH="`pwd`/../src$(PATH_SEPARATOR)$$PATH" EXTRA_DIST = \ - $(TESTS) .env-warn Coreutils.pm Makefile.am.in README acl envvar-check \ + $(TESTS) Coreutils.pm Makefile.am.in README acl envvar-check \ expensive group-names input-tty lang-default mk-script priv-check \ rwx-to-mode sample-test setgid-check umask-check very-expensive @@ -36,15 +36,7 @@ check-root: cd rm && $(MAKE) check TESTS=fail-2eperm cd tail-2 && $(MAKE) check TESTS=append-only -check-recursive: evar-check root-hint - -# Warn when `make check' is run with POSIXLY_CORRECT or CDPATH set. -.PHONY: evar-check -evar-check: - ../src/printenv POSIXLY_CORRECT >/dev/null \ - && sed s/%%/POSIXLY_CORRECT/ $(srcdir)/.env-warn || : - test "$${CDPATH+set}" = set \ - && sed s/%%/CDPATH/ $(srcdir)/.env-warn || : +check-recursive: root-hint # Advertise `check-root' target. .PHONY: root-hint diff --git a/tests/envvar-check b/tests/envvar-check index 9bc44e248..8d1d3b903 100644 --- a/tests/envvar-check +++ b/tests/envvar-check @@ -9,9 +9,11 @@ envvar_check_failed=0 vars=' BLOCKSIZE BLOCK_SIZE + CDPATH DF_BLOCK_SIZE DU_BLOCK_SIZE LS_BLOCK_SIZE + POSIXLY_CORRECT SIMPLE_BACKUP_SUFFIX TIME_STYLE VERSION_CONTROL |