From ffd85c6e61897e7dcb5d6926dfbad46928c01aee Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 11 May 2021 10:29:50 -0400
Subject: [PATCH] tests: Move tap-driver.sh out of the autotools aux directory
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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.

Running 'make check' on current RHEL or Fedora without this patch
results in the following error:

  make[5]: Entering directory '/builddir/build/BUILD/lttng-tools-2.12.4/tests/regression'
  tap-driver.sh: invalid option: '--post-script'

Change-Id: I22823176cc5b98901865c9415250ce8e49384cbd
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 configure.ac                          | 2 --
 tests/perf/Makefile.am                | 2 +-
 tests/regression/Makefile.am          | 2 +-
 tests/unit/Makefile.am                | 2 +-
 tests/utils/Makefile.am               | 2 +-
 {config => tests/utils}/tap-driver.sh | 0
 6 files changed, 4 insertions(+), 6 deletions(-)
 rename {config => tests/utils}/tap-driver.sh (100%)

diff --git a/configure.ac b/configure.ac
index 97c87e8f1..c53a978f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,8 +15,6 @@ AM_MAINTAINER_MODE([enable])
 # Enable silent rules if available (Introduced in AM 1.11)
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
-
 # Checks for C compiler
 AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
diff --git a/tests/perf/Makefile.am b/tests/perf/Makefile.am
index e841c17c5..523d4fbc5 100644
--- a/tests/perf/Makefile.am
+++ b/tests/perf/Makefile.am
@@ -2,7 +2,7 @@
 
 LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
 LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+	$(top_srcdir)/tests/utils/tap-driver.sh
 
 if LTTNG_TOOLS_BUILD_WITH_LIBPFM
 LIBS += -lpfm
diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
index 55e56c291..58269d15d 100644
--- a/tests/regression/Makefile.am
+++ b/tests/regression/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = tools kernel ust
 
 LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
 LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+	$(top_srcdir)/tests/utils/tap-driver.sh
 
 TESTS = tools/base-path/test_ust \
 	tools/channel/test_channel \
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index ff49a56e4..4d3b56fde 100644
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
 
 LOG_DRIVER_FLAGS='--merge'
 LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
-	$(top_srcdir)/config/tap-driver.sh
+	$(top_srcdir)/tests/utils/tap-driver.sh
 
 TESTS = \
 	ini_config/test_ini_config \
diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
index 893b690ff..c74d10c06 100644
--- a/tests/utils/Makefile.am
+++ b/tests/utils/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = . tap testapp
 
 EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh \
              parse-callstack.py
-dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
+dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl tap-driver.sh
 noinst_LTLIBRARIES = libtestutils.la
 
 libtestutils_la_SOURCES = utils.c utils.h
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