From 78d75878ba59e55d36205d78d98be26496e112c1 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 18 Mar 2021 17:50:48 -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. This is part of an effort to standardise our autotools setup across project to simplify maintenance. Change-Id: I4bc0bdbff05d03d8e4c0f9dcda51cf6a6cf7fec4 Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- configure.ac | 2 -- tests/benchmark/Makefile.am | 2 +- tests/regression/Makefile.am | 2 +- tests/unit/Makefile.am | 2 +- tests/utils/Makefile.am | 4 ++-- {config => tests/utils}/tap-driver.sh | 21 +++++---------------- 6 files changed, 10 insertions(+), 23 deletions(-) rename {config => tests/utils}/tap-driver.sh (95%) diff --git a/configure.ac b/configure.ac index ff5a57e..c36a9fd 100644 --- a/configure.ac +++ b/configure.ac @@ -45,8 +45,6 @@ AM_MAINTAINER_MODE([enable]) # Enable silent rules by default AM_SILENT_RULES([yes]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) - AH_TEMPLATE([CONFIG_RCU_SMP], [Enable SMP support. With SMP support enabled, uniprocessors are also supported. With SMP support disabled, UP systems work fine, but the behavior of SMP systems is undefined.]) AH_TEMPLATE([CONFIG_RCU_TLS], [TLS provided by the compiler.]) AH_TEMPLATE([CONFIG_RCU_HAVE_CLOCK_GETTIME], [clock_gettime() is detected.]) diff --git a/tests/benchmark/Makefile.am b/tests/benchmark/Makefile.am index 5068d0e..d268f3a 100644 --- a/tests/benchmark/Makefile.am +++ b/tests/benchmark/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/s TEST_EXTENSIONS = .tap TAP_LOG_DRIVER_FLAGS = --merge --comments TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/config/tap-driver.sh + $(top_srcdir)/tests/utils/tap-driver.sh SCRIPT_LIST = common.sh \ run-urcu-tests.sh \ diff --git a/tests/regression/Makefile.am b/tests/regression/Makefile.am index 183fefe..2cad8c4 100644 --- a/tests/regression/Makefile.am +++ b/tests/regression/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/s TEST_EXTENSIONS = .tap TAP_LOG_DRIVER_FLAGS = --merge --comments TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/config/tap-driver.sh + $(top_srcdir)/tests/utils/tap-driver.sh noinst_PROGRAMS = test_urcu_fork.tap \ rcutorture_urcu_membarrier \ diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 1cc9da3..ce01c91 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -2,7 +2,7 @@ AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/s LOG_DRIVER_FLAGS = --merge --comments LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \ - $(top_srcdir)/config/tap-driver.sh + $(top_srcdir)/tests/utils/tap-driver.sh noinst_PROGRAMS = test_uatomic \ test_urcu_multiflavor \ diff --git a/tests/utils/Makefile.am b/tests/utils/Makefile.am index 31d7913..08c3778 100644 --- a/tests/utils/Makefile.am +++ b/tests/utils/Makefile.am @@ -3,9 +3,9 @@ AM_CFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/s noinst_LIBRARIES = libtap.a libtap_a_SOURCES = tap.c tap.h -SCRIPT_LIST = tap.sh +SCRIPT_LIST = tap.sh tap-driver.sh -dist_noinst_SCRIPTS = $(SCRIPT_LIST) +dist_check_SCRIPTS = $(SCRIPT_LIST) all-local: @if [ x"$(srcdir)" != x"$(builddir)" ]; then \ diff --git a/config/tap-driver.sh b/tests/utils/tap-driver.sh similarity index 95% rename from config/tap-driver.sh rename to tests/utils/tap-driver.sh index 12742ca..94f1c3e 100755 --- a/config/tap-driver.sh +++ b/tests/utils/tap-driver.sh @@ -1,18 +1,7 @@ #! /bin/sh -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# SPDX-License-Identifier: GPL-2.0-or-later # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -132,7 +121,7 @@ fi # last `echo $?' statement), and would thus die reporting an internal # error. # For more information, see the Autoconf manual and the threads: - # + # # trap : 1 3 2 13 15 if test $merge -gt 0; then @@ -646,9 +635,9 @@ test $? -eq 0 || fatal "I/O or internal error" # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: -- 2.34.1