From 57770a2cce19e74b3a90f2bf60db2af5b6fee5d8 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Sat, 27 Oct 2012 18:31:21 +0200 Subject: [PATCH] tests: get rid of ./defs, it's no longer used. * defs: Delete. * configure.ac (AC_CONFIG_LINKS): No longer link it. * t/ax/tap-setup.sh: Don't look for a file named 'defs' in the grandparent directory of the current test directory to decide whether we're running in the correct directory. * syntax-check.mk (xdefs): Remove '$(srcdir)/defs'. Signed-off-by: Stefano Lattarini --- configure.ac | 2 -- defs | 22 ---------------------- syntax-checks.mk | 3 +-- t/ax/tap-setup.sh | 2 +- 4 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 defs diff --git a/configure.ac b/configure.ac index b3dfe1f79..78cdfc081 100644 --- a/configure.ac +++ b/configure.ac @@ -597,9 +597,7 @@ AC_SUBST([EXEEXT]) ## ---------------------- ## AC_CONFIG_FILES([Makefile]) - AC_CONFIG_LINKS([GNUmakefile:GNUmakefile]) -AC_CONFIG_LINKS([defs:defs]) AC_CONFIG_FILES([t/wrap/aclocal-${APIVERSION}:t/wrap/aclocal.in], [chmod +x t/wrap/aclocal-${APIVERSION}], diff --git a/defs b/defs deleted file mode 100644 index 586181e63..000000000 --- a/defs +++ /dev/null @@ -1,22 +0,0 @@ -# -*- shell-script -*- -# -# Copyright (C) 1996-2012 Free Software Foundation, Inc. -# -# 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 . -# -# This file is here for backward-compatibility with the existing -# tests still unconverted to the use of 'test-init.sh'. It should -# eventually be removed, once all the tests have been converted. - -. test-init.sh diff --git a/syntax-checks.mk b/syntax-checks.mk index dd23e2f58..16320066b 100644 --- a/syntax-checks.mk +++ b/syntax-checks.mk @@ -34,8 +34,7 @@ xtests := $(shell \ xdefs = \ $(srcdir)/t/ax/am-test-lib.sh \ $(srcdir)/t/ax/test-lib.sh \ - $(srcdir)/t/ax/test-defs.in \ - $(srcdir)/defs + $(srcdir)/t/ax/test-defs.in ams := $(shell find $(srcdir) -name '*.dir' -prune -o -name '*.am' -print) diff --git a/t/ax/tap-setup.sh b/t/ax/tap-setup.sh index 952a49dfa..bd7efe303 100644 --- a/t/ax/tap-setup.sh +++ b/t/ax/tap-setup.sh @@ -22,7 +22,7 @@ # Check that we are running from a proper directory: last thing we want # is to overwrite some random user files. -test -f ../../automake && test -f ../../defs && test -d ../../t \ +test -f ../../automake && test -f ../../runtest && test -d ../../t \ || fatal_ "running from a wrong directory" test ! -f Makefile.am || mv Makefile.am Makefile.am~ \ -- 2.47.2