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.

diff --git a/tests/list-of-tests.mk b/tests/list-of-tests.mk
index 589f90e27ce464e985ef1e423e97f245eff663b4..8f7c4905f36d2f847b9138e9796fd55b160440f4 100644 (file)
--- 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 3cec67e1442a297768c93236fecfd3df6b9f661e..b0f94e5b21ebe07bea58e08e5bcc41ba1c8cfc77 100755 (executable)
--- 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 <http://www.gnu.org/licenses/>.
 
 # 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 3a136f44493cd4c24d0ae7e28cb82ec734270c5e..c81286e64ca3bb56dde2169e8f76615fa1583fad 100755 (executable)
--- 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 <http://www.gnu.org/licenses/>.
 
-# 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