From 86f2cc9eeb65093fc55cc18edc4e22d0704b85f9 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 11 Jul 2019 13:48:05 -0400 Subject: [PATCH] tests: Move tap-driver.sh out of the autotools aux directory We have made local modifications to this script, move it to the test suite directory so it doesn't get overwritten by an updated version from autotools. Signed-off-by: Michael Jeanson Change-Id: Ie7c848c1dbd3739ed5caeb22befe73e6540e3133 Reviewed-on: https://review.lttng.org/c/babeltrace/+/1688 Tested-by: jenkins Reviewed-by: Philippe Proulx --- configure.ac | 1 - tests/Makefile.am | 2 +- tests/utils/Makefile.am | 1 + {config => tests/utils}/tap-driver.sh | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename {config => tests/utils}/tap-driver.sh (100%) diff --git a/configure.ac b/configure.ac index 4f687b08..34c0c4b0 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,6 @@ AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_lib_version) AC_CONFIG_HEADERS([src/common/config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) AC_DEFINE([BT_VERSION_MAJOR], bt_version_major, [Babeltrace major version]) AC_DEFINE([BT_VERSION_MINOR], bt_version_minor, [Babeltrace minor version]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 4bb87daa..db0ecaef 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -115,7 +115,7 @@ LOG_DRIVER = env AM_TAP_AWK='$(AWK)' \ BT_TESTS_GREP_BIN="$(GREP)" \ BT_TESTS_PYTHON_BIN="$(PYTHON)" \ BT_TESTS_SED_BIN="$(SED)" \ - $(SHELL) $(top_srcdir)/config/tap-driver.sh + $(SHELL) $(srcdir)/utils/tap-driver.sh TESTS_NO_BITFIELD = \ $(TESTS_BINDINGS) \ diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index 4ce62c91..5949df1d 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -8,4 +8,5 @@ EXTRA_DIST = python dist_check_SCRIPTS = \ run_python_bt2 \ + tap-driver.sh \ utils.sh diff --git a/config/tap-driver.sh b/tests/utils/tap-driver.sh similarity index 100% rename from config/tap-driver.sh rename to tests/utils/tap-driver.sh -- 2.34.1