From 35fb403d33021ee6eda0ec2246f2b94faf89a22f Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 23 Jul 2020 12:27:13 -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 Signed-off-by: Mathieu Desnoyers Change-Id: Ie46f0c39fe4d196b2bab3978ac02c2b1fed883c7 --- configure.ac | 2 -- tests/Makefile.am | 2 +- tests/utils/Makefile.am | 4 +++- {config => tests/utils}/tap-driver.sh | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename {config => tests/utils}/tap-driver.sh (100%) diff --git a/configure.ac b/configure.ac index eaff5ef0..d6f49226 100644 --- a/configure.ac +++ b/configure.ac @@ -47,8 +47,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/Makefile.am b/tests/Makefile.am index 204925c1..156b8396 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = utils unit compile benchmark LOG_DRIVER_FLAGS='--merge' LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/config/tap-driver.sh + $(srcdir)/utils/tap-driver.sh TESTS = \ unit/gcc-weak-hidden/test_gcc_weak_hidden \ diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index 24c0bb87..8a9bef46 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -1,3 +1,5 @@ noinst_LIBRARIES = libtap.a libtap_a_SOURCES = tap.c tap.h -dist_noinst_SCRIPTS = tap.sh +dist_check_SCRIPTS = \ + tap-driver.sh \ + tap.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