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.

diff --git a/Makefile.am b/Makefile.am
index b18ac91f00be105a40909f1eef5e8453e3a00fe2..6aacd7be94c330d6cdbe9db79df008b480085cba 100644 (file)
--- 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 5516468bb7d1f5fe8fda062b4e02bb064fdc44bc..e90cd146123a7edf98de1732a9738a8435b72576 100755 (executable)
--- 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/";