summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/expr/Makefile.am10
-rw-r--r--tests/misc/Makefile.am1
-rwxr-xr-xtests/misc/expr (renamed from tests/expr/basic)3
4 files changed, 3 insertions, 13 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 2d57bfcf5..84e0fdd87 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -44,7 +44,7 @@ EXTRA_DIST = \
## N O T E :: Please do not add new tests/ directories.
## There are too many already. Put new tests in misc/.
SUBDIRS = \
- chgrp chmod chown cp cut dd du expr factor fmt head \
+ chgrp chmod chown cp cut dd du factor fmt head \
install join ln ls ls-2 md5sum misc mkdir mv od pr readlink rm rmdir \
seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
tsort unexpand uniq wc
diff --git a/tests/expr/Makefile.am b/tests/expr/Makefile.am
deleted file mode 100644
index 7440c74dc..000000000
--- a/tests/expr/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-TESTS = basic
-EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
- top_srcdir=$(top_srcdir) \
- srcdir=$(srcdir) \
- PERL="$(PERL)" \
- CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
- PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
- PROG=expr
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 9555636f9..f1775d85e 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -66,6 +66,7 @@ TESTS = \
df \
dirname \
expand \
+ expr \
false-status \
fold \
groups-version \
diff --git a/tests/expr/basic b/tests/misc/expr
index 5227da049..2a7f4c0d5 100755
--- a/tests/expr/basic
+++ b/tests/misc/expr
@@ -32,12 +32,11 @@ require 5.003;
use strict;
(my $program_name = $0) =~ s|.*/||;
+my $prog = 'expr';
# Turn off localisation of executable's ouput.
@ENV{qw(LANGUAGE LANG LC_ALL)} = ('C') x 3;
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
-
my @Tests =
(
['a', '5 + 6', {OUT => '11'}],