summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>2009-08-07 02:23:01 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-08-07 19:15:28 +0200
commit405e606f8649fd87a8a1d2e5a6399c27dcae28b8 (patch)
treef24978889764416c8f12150e8f0e3d864a48f3d2
parent59d93adb29fae25220955d44a5cd25f0d99e3528 (diff)
Replace the custom test-run target with the standard make check.
A little fix is needed for the udev-test.pl script (to be called with the proper path), but this allows for the test binaries to be only built when running the tests themselves.
-rw-r--r--Makefile.am6
-rwxr-xr-xtest/udev-test.pl2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am
index b18ac91f00..6aacd7be94 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,9 +41,6 @@ changelog:
@ cat ChangeLog.tmp >> ChangeLog
@ rm ChangeLog.tmp
-test-run:
- cd test && ./udev-test.pl
-
test-install:
rm -rf $(PWD)/udev-test-install/
make DESTDIR=$(PWD)/udev-test-install install
@@ -190,6 +187,9 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la
# ------------------------------------------------------------------------------
# Tests
# ------------------------------------------------------------------------------
+
+TESTS = test/udev-test.pl
+
check_PROGRAMS = \
libudev/test-libudev \
udev/test-udev
diff --git a/test/udev-test.pl b/test/udev-test.pl
index 5516468bb7..e90cd14612 100755
--- a/test/udev-test.pl
+++ b/test/udev-test.pl
@@ -22,7 +22,7 @@ use strict;
my $PWD = $ENV{PWD};
my $sysfs = "sys/";
-my $udev_bin = "../udev/test-udev";
+my $udev_bin = "udev/test-udev";
my $valgrind = 0;
my $udev_bin_valgrind = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
my $udev_root = "udev-root/";