summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@derf.homelinux.org>2010-05-06 00:43:16 +0200
committerDaniel Friesel <derf@derf.homelinux.org>2010-05-06 00:43:16 +0200
commit3717d3046c836f9c65dc1b7293134f56aea9e84c (patch)
treeb5e704386ce14ad76c87646ded765ea13e237b16
parentc70587fdda762dca3c03aa75a0185493db75607a (diff)
Use prove for tests. Might be a bit ugly right now... hm.
-rw-r--r--Makefile4
-rw-r--r--test/feh.t (renamed from test/test.pl)2
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 53a1b5d..f348d57 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ all:
@${MAKE} -C src
test: all
- mandoc -Tlint man/*
- perl test/test.pl ${PACKAGE} ${VERSION}
+ @mandoc -Tlint man/*
+ @PACKAGE=${PACKAGE} VERSION=${VERSION} prove test
install: install-man install-doc install-bin install-font install-img
diff --git a/test/test.pl b/test/feh.t
index 4b18ccc..2db0db0 100644
--- a/test/test.pl
+++ b/test/feh.t
@@ -7,7 +7,7 @@ use Test::Command tests => 48;
my $feh = 'src/feh';
my $images = 'test/ok.* test/fail.*';
-my ($feh_name, $feh_version) = @ARGV;
+my ($feh_name, $feh_version) = @ENV{'PACKAGE', 'VERSION'};
my $re_warning =
qr{${feh_name} WARNING: test/fail\.... \- No Imlib2 loader for that file format\n};