From b94e8bb67517e6cbfb84a7666e5690d4abc56d97 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Wed, 18 Jan 2012 14:47:10 +0100 Subject: [PATCH] tests: better name for a couple of tests Two tests checking "make -n" behaviour with the parallel-tests harness has been introduced in the Automake repository in the past: one of them ('parallel-tests-dryrun.test') in the maint branch, the other one ('parallel-tests-dry-run.test') in the master branch. Needless to say, their too-much-similar names can be a great source of confusion now. Moreover, the two tests have been written during distinct refactorings, and are meant to exercise different code paths and/or usage scenarios, so that no one of them subsumes the other, and they should be both kept. Thus we simply rename both of them to avoid future confusion. * tests/parallel-tests-dryrun.test: Renamed ... * tests/parallel-tests-dry-run-1.test: .. to this. * tests/parallel-tests-dry-run.test: Renamed ... * tests/parallel-tests-dry-run-2.test: .. to this. Add cross-reference among them. * tests/list-of-tests.mk: Adjust. --- tests/list-of-tests.mk | 4 ++-- tests/{parallel-tests-dryrun.test => parallel-tests-dry-run-1.test} | 1 + .../{parallel-tests-dry-run.test => parallel-tests-dry-run-2.test} | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) rename tests/{parallel-tests-dryrun.test => parallel-tests-dry-run-1.test} (96%) rename tests/{parallel-tests-dry-run.test => parallel-tests-dry-run-2.test} (93%) diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk index 589f90e..8f7c490 100644 --- a/tests/list-of-tests.mk +++ b/tests/list-of-tests.mk @@ -700,8 +700,8 @@ parallel-tests-suffix.test \ parallel-tests-suffix-prog.test \ parallel-tests-log-compiler-1.test \ parallel-tests-log-compiler-2.test \ -parallel-tests-dry-run.test \ -parallel-tests-dryrun.test \ +parallel-tests-dry-run-1.test \ +parallel-tests-dry-run-2.test \ parallel-tests-fd-redirect.test \ parallel-tests-extra-programs.test \ parallel-tests-unreadable.test \ diff --git a/tests/parallel-tests-dryrun.test b/tests/parallel-tests-dry-run-1.test similarity index 96% rename from tests/parallel-tests-dryrun.test rename to tests/parallel-tests-dry-run-1.test index 3cec67e..b0f94e5 100755 --- a/tests/parallel-tests-dryrun.test +++ b/tests/parallel-tests-dry-run-1.test @@ -15,6 +15,7 @@ # along with this program. If not, see . # Check parallel-tests interactions with "make -n". +# See also sister test 'parallel-tests-dry-run-2.test'. am_parallel_tests=yes . ./defs || Exit 1 diff --git a/tests/parallel-tests-dry-run.test b/tests/parallel-tests-dry-run-2.test similarity index 93% rename from tests/parallel-tests-dry-run.test rename to tests/parallel-tests-dry-run-2.test index 3a136f4..c81286e 100755 --- a/tests/parallel-tests-dry-run.test +++ b/tests/parallel-tests-dry-run-2.test @@ -1,5 +1,5 @@ #! /bin/sh -# Copyright (C) 2011 Free Software Foundation, Inc. +# Copyright (C) 2011, 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 @@ -14,8 +14,8 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -# Check `make -n' for testsuite-related targets, when `parallel-tests' -# is in use. +# Check parallel-tests interactions with "make -n". +# See also sister test 'parallel-tests-dry-run-1.test'. am_parallel_tests=yes . ./defs || Exit 1 -- 2.7.4