|
 |
8b737d8 |
From 307f5e8b83332cd05692bf2b648c3888681f3e3c Mon Sep 17 00:00:00 2001
|
|
|
8b737d8 |
From: Michael Jeanson <mjeanson@efficios.com>
|
|
|
8b737d8 |
Date: Tue, 11 May 2021 10:29:50 -0400
|
|
|
8b737d8 |
Subject: [PATCH lttng-tools] tests: Move tap-driver.sh out of the autotools
|
|
|
8b737d8 |
aux directory
|
|
|
8b737d8 |
|
|
|
8b737d8 |
We have made local modifications to this script, move it to the test
|
|
|
8b737d8 |
suite directory so it doesn't get overwritten by an updated version from
|
|
|
8b737d8 |
autotools.
|
|
|
8b737d8 |
|
|
|
8b737d8 |
Running 'make check' on current RHEL or Fedora without this patch
|
|
|
8b737d8 |
results in the following error:
|
|
|
8b737d8 |
|
|
|
8b737d8 |
make[5]: Entering directory '/builddir/build/BUILD/lttng-tools-2.12.4/tests/regression'
|
|
|
8b737d8 |
tap-driver.sh: invalid option: '--post-script'
|
|
|
8b737d8 |
|
|
|
8b737d8 |
Change-Id: I22823176cc5b98901865c9415250ce8e49384cbd
|
|
|
8b737d8 |
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
|
|
|
8b737d8 |
---
|
|
|
8b737d8 |
configure.ac | 2 --
|
|
|
8b737d8 |
tests/regression/Makefile.am | 2 +-
|
|
|
8b737d8 |
tests/unit/Makefile.am | 2 +-
|
|
|
8b737d8 |
tests/utils/Makefile.am | 2 +-
|
|
|
8b737d8 |
{config => tests/utils}/tap-driver.sh | 0
|
|
|
8b737d8 |
5 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
8b737d8 |
rename {config => tests/utils}/tap-driver.sh (100%)
|
|
|
8b737d8 |
|
|
|
8b737d8 |
diff --git a/configure.ac b/configure.ac
|
|
|
8b737d8 |
index 9545673c8..572d319c9 100644
|
|
|
8b737d8 |
--- a/configure.ac
|
|
|
8b737d8 |
+++ b/configure.ac
|
|
|
8b737d8 |
@@ -15,8 +15,6 @@ AM_MAINTAINER_MODE([enable])
|
|
|
8b737d8 |
# Enable silent rules if available (Introduced in AM 1.11)
|
|
|
8b737d8 |
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
|
|
8b737d8 |
|
|
|
8b737d8 |
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
|
|
|
8b737d8 |
-
|
|
|
8b737d8 |
# Checks for C compiler
|
|
|
8b737d8 |
AC_USE_SYSTEM_EXTENSIONS
|
|
|
8b737d8 |
AC_SYS_LARGEFILE
|
|
|
8b737d8 |
diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am
|
|
|
8b737d8 |
index 0e9f2576b..73e49c997 100644
|
|
|
8b737d8 |
--- a/tests/regression/Makefile.am
|
|
|
8b737d8 |
+++ b/tests/regression/Makefile.am
|
|
|
8b737d8 |
@@ -4,7 +4,7 @@ SUBDIRS = tools kernel ust
|
|
|
8b737d8 |
|
|
|
8b737d8 |
LOG_DRIVER_FLAGS = --merge --post-script $(top_srcdir)/tests/utils/warn_processes.sh
|
|
|
8b737d8 |
LOG_DRIVER = env PGREP='$(PGREP)' AM_TAP_AWK='$(AWK)' $(SHELL) \
|
|
|
8b737d8 |
- $(top_srcdir)/config/tap-driver.sh
|
|
|
8b737d8 |
+ $(top_srcdir)/tests/utils/tap-driver.sh
|
|
|
8b737d8 |
|
|
|
8b737d8 |
TESTS = tools/base-path/test_ust \
|
|
|
8b737d8 |
tools/filtering/test_invalid_filter \
|
|
|
8b737d8 |
diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
|
|
|
8b737d8 |
index 09de39e8c..87304176e 100644
|
|
|
8b737d8 |
--- a/tests/unit/Makefile.am
|
|
|
8b737d8 |
+++ b/tests/unit/Makefile.am
|
|
|
8b737d8 |
@@ -6,7 +6,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/tests/utils/ -I$(srcdir)
|
|
|
8b737d8 |
|
|
|
8b737d8 |
LOG_DRIVER_FLAGS='--merge'
|
|
|
8b737d8 |
LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
|
|
|
8b737d8 |
- $(top_srcdir)/config/tap-driver.sh
|
|
|
8b737d8 |
+ $(top_srcdir)/tests/utils/tap-driver.sh
|
|
|
8b737d8 |
|
|
|
8b737d8 |
TESTS = test_kernel_data \
|
|
|
8b737d8 |
test_session \
|
|
|
8b737d8 |
diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am
|
|
|
8b737d8 |
index 893b690ff..c74d10c06 100644
|
|
|
8b737d8 |
--- a/tests/utils/Makefile.am
|
|
|
8b737d8 |
+++ b/tests/utils/Makefile.am
|
|
|
8b737d8 |
@@ -4,7 +4,7 @@ SUBDIRS = . tap testapp
|
|
|
8b737d8 |
|
|
|
8b737d8 |
EXTRA_DIST = utils.sh test_utils.py babelstats.pl warn_processes.sh \
|
|
|
8b737d8 |
parse-callstack.py
|
|
|
8b737d8 |
-dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl
|
|
|
8b737d8 |
+dist_noinst_SCRIPTS = utils.sh test_utils.py babelstats.pl tap-driver.sh
|
|
|
8b737d8 |
noinst_LTLIBRARIES = libtestutils.la
|
|
|
8b737d8 |
|
|
|
8b737d8 |
libtestutils_la_SOURCES = utils.c utils.h
|
|
|
8b737d8 |
diff --git a/config/tap-driver.sh b/tests/utils/tap-driver.sh
|
|
|
8b737d8 |
similarity index 100%
|
|
|
8b737d8 |
rename from config/tap-driver.sh
|
|
|
8b737d8 |
rename to tests/utils/tap-driver.sh
|
|
|
8b737d8 |
--
|
|
|
8b737d8 |
2.25.1
|
|
|
8b737d8 |
|