From 9b80f05fb727edc70a305d912ab6cf1c3bdbf67e Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay@vrfy.org>
Date: Fri, 13 Apr 2012 15:57:13 +0200
Subject: [PATCH] udev: unpack sysfs test tree only on 'make check'; fix
 test-udev binary location

---
 Makefile.am                | 14 ++++++++------
 src/udev/test/udev-test.pl |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d13963f71..ebbee0420 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,6 +98,8 @@ dist_dbuspolicy_DATA =
 dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
+check_DATA =
+noinst_PROGRAMS =
 TESTS =
 
 AM_CPPFLAGS = \
@@ -856,7 +858,7 @@ EXTRA_DIST += \
 	src/core/systemd.pc.in
 
 # ------------------------------------------------------------------------------
-check_PROGRAMS += \
+noinst_PROGRAMS += \
 	test-engine \
 	test-job-type \
 	test-ns \
@@ -1487,7 +1489,7 @@ TESTS += \
 	src/udev/test/udev-test.pl \
 	src/udev/test/rules-test.sh
 
-check_PROGRAMS += \
+noinst_PROGRAMS += \
 	test-libudev \
 	test-udev
 
@@ -1505,7 +1507,7 @@ test_udev_LDADD = \
 	libudev-private.la \
 	libsystemd-shared.la
 
-test_udev_DEPENDENCIES = \
+check_DATA += \
 	src/udev/test/sys
 
 # packed sysfs test tree
@@ -1929,7 +1931,7 @@ test_id128_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-id128.la
 
-check_PROGRAMS += \
+noinst_PROGRAMS += \
 	test-id128
 
 TESTS += \
@@ -2111,7 +2113,7 @@ libsystemd-journal-uninstall-hook:
 UNINSTALL_EXEC_HOOKS += \
 	libsystemd-journal-uninstall-hook
 
-check_PROGRAMS += \
+noinst_PROGRAMS += \
 	test-journal \
 	test-journal-send
 
@@ -2634,7 +2636,7 @@ test_login_LDADD = \
 	libsystemd-login.la \
 	libsystemd-shared.la
 
-check_PROGRAMS += \
+noinst_PROGRAMS += \
 	test-login
 
 libsystemd_login_la_SOURCES = \
diff --git a/src/udev/test/udev-test.pl b/src/udev/test/udev-test.pl
index e2bfae32b..a09e1b5fe 100755
--- a/src/udev/test/udev-test.pl
+++ b/src/udev/test/udev-test.pl
@@ -22,7 +22,7 @@ use strict;
 
 my $PWD                 = $ENV{PWD};
 my $sysfs               = "src/udev/test/sys";
-my $udev_bin            = ".libs/test-udev";
+my $udev_bin            = "./test-udev";
 my $valgrind            = 0;
 my $udev_bin_valgrind   = "valgrind --tool=memcheck --leak-check=yes --quiet $udev_bin";
 my $udev_root           = "udev-root";
-- 
2.30.2