Changeset 535 for trunk/src/gmake/Makefile.kmk

Timestamp:

Sep 19, 2006, 6:29:18 AM (19 years ago)

Author:

bird

Message:

o A real attempt at fixing the double quoting problem on windows. ash seems to want a

space between a double quote enclosing the last argument on the commandline and the
double quote enclosing the commandline (the -c argument). Also, defined HAVE_CYGWIN_SHELL.

o Fixed a newline escape problem when using batch_mode_shell on windows with kmk_ash.

File:

• trunk/src/gmake/Makefile.kmk (modified) (2 diffs)

trunk/src/gmake/Makefile.kmk

@@ -30 +30 @@
         CONFIG_WITH_VALUE_LENGTH \
         CONFIG_WITH_COMPARE
+kmk_DEFS.win32 = HAVE_CYGWIN_SHELL
+kmk_DEFS.win64 = HAVE_CYGWIN_SHELL
 
 kmk_SOURCES = \
@@ -272 +274 @@
         echo "4"
 
-# shell double and single quoting check.
+
+#
+# Shell execution tests.
+#
+test_shell: test_shell_quoting test_shell_newline
+
+# shell double and single quoting check (was busted on windows in 3.81).
 test_shell_quoting:
+        $(ECHO_EXT) "double quoted sTrInG"
         $(ECHO_EXT) "double quoted sTrInG" | $(SED_EXT) -e "s/sTrInG/string/g"
         $(ECHO_EXT) 'single quoted sTrInG' | $(SED_EXT) -e 's/sTrInG/string/g'
         $(ECHO) "This string should not be printed with double quotes."
         $(ECHO) 'This string should not be printed with single quotes.'
+
+# when using batch mode shell, the newline got escaped twice and spoiling everything.
+test_shell_newline:
+        $(ECHO_EXT) "foo foo foo" | $(SED_EXT) -e \
+                's/foo/$@/' -e \
+                's/foo/works/' \
+                -e 's/foo/\!/'
+