From da0dfbe7715c8f9558d7ee212b7eb8aac852a2ec Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 3 Jan 2013 12:54:07 +0100 Subject: [PATCH] tests: move runtest.in away from the top-lever directory Not only this leaves the top-lever directory less cluttered, but helps in keeping the testsuite-related files more "centralized". * runtest.in: Move ... * t/ax/runtest.in: ... here. While at it, add customary '@configure_input@' comment line. * Makefile.am (runtest, EXTRA_DIST): Adjust. Signed-off-by: Stefano Lattarini --- Makefile.am | 10 +++++----- runtest.in => t/ax/runtest.in | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) rename runtest.in => t/ax/runtest.in (99%) diff --git a/Makefile.am b/Makefile.am index 0c9d8b7..d868501 100644 --- a/Makefile.am +++ b/Makefile.am @@ -337,7 +337,7 @@ TESTS = # Some testsuite-influential variables should be overridable from the # test scripts, but not from the environment. -# Keep this in sync with the similar list in 'runtest.in'. +# Keep this in sync with the similar list in 't/ax/runtest.in'. AM_TESTS_ENVIRONMENT = \ for v in \ required \ @@ -445,14 +445,14 @@ EXTRA_DIST += t/ax/shell-no-trail-bslash.in CLEANFILES += t/ax/shell-no-trail-bslash noinst_SCRIPTS += t/ax/shell-no-trail-bslash -runtest: runtest.in Makefile +runtest: t/ax/runtest.in Makefile $(AM_V_at)rm -f $@ $@-t - $(AM_V_GEN)in=runtest.in \ + $(AM_V_GEN)in=t/ax/runtest.in \ && $(MKDIR_P) t/ax \ - && $(do_subst) <$(srcdir)/runtest.in >$@-t \ + && $(do_subst) <$(srcdir)/$$in >$@-t \ && chmod a+x $@-t $(generated_file_finalize) -EXTRA_DIST += runtest.in +EXTRA_DIST += t/ax/runtest.in CLEANFILES += runtest noinst_SCRIPTS += runtest diff --git a/runtest.in b/t/ax/runtest.in similarity index 99% rename from runtest.in rename to t/ax/runtest.in index 364ba4a..57d16a0 100644 --- a/runtest.in +++ b/t/ax/runtest.in @@ -1,4 +1,5 @@ #!@AM_TEST_RUNNER_SHELL@ +# @configure_input@ # # Copyright (C) 2012-2013 Free Software Foundation, Inc. # -- 2.7.4