summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2011-04-23 21:37:09 +0200
committerDaniel Friesel <derf@finalrewind.org>2011-04-23 21:37:09 +0200
commit62a1db81ac1ed92d9a6e2c98d13d5ebd90d98051 (patch)
tree1c8888619b5d0036a5ad6d290d569af2c9f850e4
parent8633fec8983e476d152209fe1db1007452c6a070 (diff)
feh.t: The version is no longer tested
-rw-r--r--Makefile2
-rw-r--r--test/feh.t11
2 files changed, 6 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 7723482..a5d5ddd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ build-man:
@${MAKE} -C man
test: all
- @PACKAGE=${PACKAGE} VERSION=${VERSION} prove test
+ @PACKAGE=${PACKAGE} prove test
test-x11: all
test/run-interactive
diff --git a/test/feh.t b/test/feh.t
index b19d1c9..ac9262f 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -10,7 +10,7 @@ my $feh = "src/feh";
my $images = 'test/ok/gif test/ok/jpg test/ok/png test/ok/pnm '
. 'test/fail/gif test/fail/jpg test/fail/png test/fail/pnm';
-my ($feh_name, $feh_version) = @ENV{'PACKAGE', 'VERSION'};
+my $feh_name = $ENV{'PACKAGE'};
# These tests are meant to run non-interactively and without X.
# make sure they are capable of doing so.
@@ -18,18 +18,17 @@ delete $ENV{'DISPLAY'};
my $err_no_env = <<'EOF';
-Unable to determine feh PACKAGE or VERSION.
+Unable to determine feh PACKAGE.
This is most likely because you ran 'prove test' or 'perl test/feh.t'.
-Sinc this test uses make variables and is therefore designed to be run from
+Since this test uses make variables and is therefore designed to be run from
the Makefile only, use 'make test' instead.
If you absolutely need to run it the other way, use
- PACKAGE=feh VERSION=1.5 ${your_command}
-(with the appropiate values, of course).
+ PACKAGE=feh ${your_command}
EOF
-if (length($feh_name) == 0 or length($feh_version) == 0) {
+if (length($feh_name) == 0) {
die($err_no_env);
}