Rename dash-w to print-directory.

Avoid conflicts with dash-W on case-insensitive filesystems.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index eaeb7c0ef07464a19f346ca3ec03ef2b27668f49..9e2deb37532e2cfb868980e2071f9c48582843c1 100644 (file)
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,9 @@
+2013-09-23  Paul Smith  <psmith@gnu.org>
+
+       * scripts/options/print-directory: Rename dash-w to
+       print-directory to avoid conflicts with dash-W on case-insensitive
+       filesystems.
+
 2013-09-22  Paul Smith  <psmith@gnu.org>
 
        * scripts/features/se_implicit: Verify that order-only tokens

diff --git a/tests/scripts/options/dash-w b/tests/scripts/options/dash-w
deleted file mode 100644 (file)
index a05bbee..0000000
--- a/tests/scripts/options/dash-w
+++ /dev/null
@@ -1,33 +0,0 @@
-#                                                                    -*-perl-*-
-
-$description = "Test the -w option to GNU make.";
-
-# Simple test without -w
-run_make_test(q!
-all: ; @echo hi
-!,
-        "", "hi\n");
-
-# Simple test with -w
-run_make_test(undef, "-w",
-              "#MAKE#: Entering directory '#PWD#'\nhi\n#MAKE#: Leaving directory '#PWD#'\n");
-
-# Test makefile rebuild to ensure no enter/leave
-run_make_test(q!
-include foo
-all: ;@:
-foo: ; touch foo
-!,
-        "", "#MAKEFILE#:2: foo: No such file or directory\ntouch foo\n");
-unlink('foo');
-
-# Test makefile rebuild with -w
-run_make_test(q!
-include foo
-all: ;@:
-foo: ; touch foo
-!,
-        "-w", "#MAKE#: Entering directory '#PWD#'\n#MAKEFILE#:2: foo: No such file or directory\ntouch foo\n#MAKE#: Leaving directory '#PWD#'\n");
-unlink('foo');
-
-1;

diff --git a/tests/scripts/options/print-directory b/tests/scripts/options/print-directory
new file mode 100644 (file)
index 0000000..a05bbee
--- /dev/null
+++ b/tests/scripts/options/print-directory
@@ -0,0 +1,33 @@
+#                                                                    -*-perl-*-
+
+$description = "Test the -w option to GNU make.";
+
+# Simple test without -w
+run_make_test(q!
+all: ; @echo hi
+!,
+        "", "hi\n");
+
+# Simple test with -w
+run_make_test(undef, "-w",
+              "#MAKE#: Entering directory '#PWD#'\nhi\n#MAKE#: Leaving directory '#PWD#'\n");
+
+# Test makefile rebuild to ensure no enter/leave
+run_make_test(q!
+include foo
+all: ;@:
+foo: ; touch foo
+!,
+        "", "#MAKEFILE#:2: foo: No such file or directory\ntouch foo\n");
+unlink('foo');
+
+# Test makefile rebuild with -w
+run_make_test(q!
+include foo
+all: ;@:
+foo: ; touch foo
+!,
+        "-w", "#MAKE#: Entering directory '#PWD#'\n#MAKEFILE#:2: foo: No such file or directory\ntouch foo\n#MAKE#: Leaving directory '#PWD#'\n");
+unlink('foo');
+
+1;