Fix: out-of-tree benchmark/regtest

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am
index 7be25256e0a07ef601138c252197b2115a9447ce..2326721ac4577aae8420da955d147b19363fb2ad 100644 (file)
--- a/tests/benchmark/Makefile.am
+++ b/tests/benchmark/Makefile.am
@@ -20,7 +20,11 @@ SCRIPT_LIST = common.sh \
 
 dist_noinst_SCRIPTS = $(SCRIPT_LIST)
 
-dist_noinst_DATA = regression_tests short_bench_tests long_bench_tests
+TEST_LIST = regression_tests \
+       short_bench_tests \
+       long_bench_tests
+
+dist_noinst_DATA = $(TEST_LIST)
 
 noinst_PROGRAMS = test_urcu test_urcu_dynamic_link test_urcu_timing \
        test_urcu_signal test_urcu_signal_dynamic_link test_urcu_signal_timing \
@@ -213,14 +217,14 @@ test_urcu_hash_LDADD = $(URCU_QSBR_LIB) $(URCU_COMMON_LIB) $(URCU_CDS_LIB)
 
 all-local:
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-               for script in $(SCRIPT_LIST); do \
+               for script in $(SCRIPT_LIST) $(TEST_LIST); do \
                        cp -f $(srcdir)/$$script $(builddir); \
                done; \
        fi
 
 clean-local:
        @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
-               for script in $(SCRIPT_LIST); do \
+               for script in $(SCRIPT_LIST) $(TEST_LIST); do \
                        rm -f $(builddir)/$$script; \
                done; \
        fi

diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
index 24c0bb87942600b6fb26879578e0485af4d92f8d..6f45810ba303707db6f02cb7d1fd7443d852ecb0 100644 (file)
--- a/tests/utils/Makefile.am
+++ b/tests/utils/Makefile.am
@@ -1,3 +1,20 @@
 noinst_LIBRARIES = libtap.a
 libtap_a_SOURCES = tap.c tap.h
-dist_noinst_SCRIPTS = tap.sh
+
+SCRIPT_LIST = tap.sh
+
+dist_noinst_SCRIPTS = $(SCRIPT_LIST)
+
+all-local:
+       @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+               for script in $(SCRIPT_LIST); do \
+                       cp -f $(srcdir)/$$script $(builddir); \
+               done; \
+       fi
+
+clean-local:
+       @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
+               for script in $(SCRIPT_LIST); do \
+                       rm -f $(builddir)/$$script; \
+               done; \
+       fi