From 77f6f454f566f2fad79f70fc824667843566464c Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 29 Jan 2002 20:23:48 +0000 Subject: [PATCH] 1.3.13 Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 * tests/shell-test.c: Workaround for MSVC bugs. (#61064) --- ChangeLog | 6 +++++- ChangeLog.pre-2-0 | 6 +++++- ChangeLog.pre-2-10 | 6 +++++- ChangeLog.pre-2-12 | 6 +++++- ChangeLog.pre-2-2 | 6 +++++- ChangeLog.pre-2-4 | 6 +++++- ChangeLog.pre-2-6 | 6 +++++- ChangeLog.pre-2-8 | 6 +++++- tests/shell-test.c | 18 ++++++++++++------ 9 files changed, 52 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27bbf0218..6134076cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 27bbf0218..6134076cb 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,7 +1,11 @@ -Tue Jan 29 14:06:22 2002 Owen Taylor +Tue Jan 29 15:04:31 2002 Owen Taylor * 1.3.13 + * tests/shell-test.c: Workaround for MSVC bugs. (#61064) + +Tue Jan 29 14:06:22 2002 Owen Taylor + * NEWS: Update to include last change. 2002-01-21 Jeffrey Stedfast diff --git a/tests/shell-test.c b/tests/shell-test.c index e960412e9..0142b2540 100644 --- a/tests/shell-test.c +++ b/tests/shell-test.c @@ -269,19 +269,25 @@ main (int argc, CHECK_STRING_RESULT (test_shell_unquote ("\\\n"), ""); CHECK_STRING_RESULT (test_shell_unquote ("'\\''"), "G_SHELL_ERROR_BAD_QUOTING"); + +#if defined (_MSC_VER) && (_MSC_VER <= 1200) + /* using \x22 instead of \" to work around a msvc 5.0, 6.0 compiler bug */ + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\\x22\""), "\""); +#else CHECK_STRING_RESULT (test_shell_unquote ("\"\\\"\""), "\""); +#endif CHECK_STRING_RESULT (test_shell_unquote ("\""), "G_SHELL_ERROR_BAD_QUOTING"); CHECK_STRING_RESULT (test_shell_unquote ("'"), "G_SHELL_ERROR_BAD_QUOTING"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\\\\""), "\\"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\`\""), "`"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\$\""), "$"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\\n\""), "\n"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\\\\""), "\\"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\`\""), "`"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\$\""), "$"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\\n\""), "\n"); CHECK_STRING_RESULT (test_shell_unquote ("\"\\'\""), "\\'"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\\r\""), "\\\r"); - CHECK_STRING_RESULT (test_shell_unquote ("\"\\n\""), "\\n"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\\r\""), "\\\r"); + CHECK_STRING_RESULT (test_shell_unquote ("\x22\\n\""), "\\n"); return any_test_failed ? 1 : 0; }