From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 7 Aug 2009 00:23:01 +0000 (+0200)
Subject: Replace the custom test-run target with the standard make check.
X-Git-Tag: 174~854
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=405e606f8649fd87a8a1d2e5a6399c27dcae28b8

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 b18ac91f0..6aacd7be9 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 5516468bb..e90cd1461 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/";