From 2ea58a693a53eff9c07ae6a683671cf0bf79415f Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 16 Oct 2015 19:09:00 -0400 Subject: [PATCH] Fix: out-of-tree benchmark/regtest Signed-off-by: Mathieu Desnoyers --- tests/benchmark/Makefile.am | 10 +++++++--- tests/utils/Makefile.am | 19 ++++++++++++++++++- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 7be2525..2326721 100644 --- 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 24c0bb8..6f45810 100644 --- 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 -- 2.34.1