From ccf5a73267872a4088953d0c3f41747427912fde Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Tue, 7 Jun 2016 12:09:27 -0400 Subject: [PATCH] Tests: no substitution needed for multi-trace intersection test MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The use of AC_CONFIG_FILES on with src == dest causes the source file to be deleted on make distclean. Signed-off-by: Jérémie Galarneau --- configure.ac | 1 - tests/bin/intersection/Makefile.am | 16 +++++++++++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 0b7bde25..97d949ef 100644 --- a/configure.ac +++ b/configure.ac @@ -335,7 +335,6 @@ AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read AC_CONFIG_FILES([tests/bin/intersection/test_intersection], [chmod +x tests/bin/intersection/test_intersection]) AC_CONFIG_FILES([tests/bin/intersection/bt_python_helper.py]) AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num]) -AC_CONFIG_FILES([tests/bin/intersection/test_multi_trace_intersection.py:tests/bin/intersection/test_multi_trace_intersection.py], [chmod +x tests/bin/intersection/test_multi_trace_intersection.py]) AC_OUTPUT diff --git a/tests/bin/intersection/Makefile.am b/tests/bin/intersection/Makefile.am index 664bc3a0..6c7330e5 100644 --- a/tests/bin/intersection/Makefile.am +++ b/tests/bin/intersection/Makefile.am @@ -2,5 +2,19 @@ check_SCRIPTS = test_intersection \ bt_python_helper.py \ test_multi_trace_intersection.py -SCRIPT_LIST = test_multi_trace_intersection.py dist_noinst_SCRIPTS = test_multi_trace_intersection.py +EXTRA_DIST=test_multi_trace_intersection.py + +all-local: + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for script in $(EXTRA_DIST); do \ + cp -f $(srcdir)/$$script $(builddir); \ + done; \ + fi + +clean-local: + @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ + for script in $(EXTRA_DIST); do \ + rm -f $(builddir)/$$script; \ + done; \ + fi -- 2.34.1