From 0bd179ffcd501ae84ec11a3b81b47836a1c0fdc0 Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@gmail.com>
Date: Sun, 3 Jul 2016 11:19:38 -0400
Subject: tests: run file via libtool to determine shell scripts

The actual output file might be a wrapper script, so lets follow the indirection

Fixes: #3644
---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 0ec407520b..fa81400bd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6417,7 +6417,7 @@ install-tree: all
 .PHONY: valgrind-tests
 valgrind-tests: $(TESTS)
 	$(AM_V_GEN)for f in $(filter-out %.pl %.py, $^); do \
-		if file $$f | grep -q shell; then \
+		if $(LIBTOOL) --mode=execute file $$f | grep -q shell; then \
 		echo -e "$${x}Skipping non-binary $$f"; else \
 		echo -e "$${x}Running $$f"; \
 		$(LIBTOOL) --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
-- 
cgit v1.2.3-54-g00ecf


From 65e15f402fab9a496ed74f86d5fbe35ba661ea65 Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@gmail.com>
Date: Sun, 3 Jul 2016 18:32:48 -0400
Subject: build-sys: link test-keymap-util against libsystemd-shared

---
 Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index fa81400bd2..f71ce848ee 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4861,7 +4861,7 @@ test_keymap_util_SOURCES = \
 	src/locale/keymap-util.h
 
 test_keymap_util_LDADD = \
-	libshared.la \
+	libsystemd-shared.la \
 	-ldl
 
 tests += \
-- 
cgit v1.2.3-54-g00ecf