From: Alexander Merkle alexander.merkle@lauterbach.com
Heavily inspired by https://gitlab.winehq.org/wine/wine/-/merge_requests/277 https://gitlab.winehq.org/bernhardu/wine/-/tree/51599_cmd_brackets by Bernhard Übelacker bernhardu@mailbox.org . Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51599
Signed-off-by: Alexander Merkle alexander.merkle@lauterbach.com --- programs/cmd/tests/rsrc.rc | 12 ------------ programs/cmd/tests/test_block_if_eof1.cmd | 5 ----- programs/cmd/tests/test_block_if_eof1.cmd.exp | 1 - programs/cmd/tests/test_block_if_eof2.cmd | 5 ----- programs/cmd/tests/test_block_if_eof2.cmd.exp | 1 - programs/cmd/tests/test_builtins.cmd | 13 +++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 3 +++ 7 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 programs/cmd/tests/test_block_if_eof1.cmd delete mode 100644 programs/cmd/tests/test_block_if_eof1.cmd.exp delete mode 100644 programs/cmd/tests/test_block_if_eof2.cmd delete mode 100644 programs/cmd/tests/test_block_if_eof2.cmd.exp
diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc index 382e297c468..9506d398ab3 100644 --- a/programs/cmd/tests/rsrc.rc +++ b/programs/cmd/tests/rsrc.rc @@ -22,18 +22,6 @@ test_builtins.cmd TESTCMD "test_builtins.cmd" /* @makedep: test_builtins.cmd.exp */ test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp"
-/* @makedep: test_block_if_eof1.cmd */ -test_block_if_eof1.cmd TESTCMD "test_block_if_eof1.cmd" - -/* @makedep: test_block_if_eof1.cmd.exp */ -test_block_if_eof1.cmd.exp TESTOUT "test_block_if_eof1.cmd.exp" - -/* @makedep: test_block_if_eof2.cmd */ -test_block_if_eof2.cmd TESTCMD "test_block_if_eof2.cmd" - -/* @makedep: test_block_if_eof2.cmd.exp */ -test_block_if_eof2.cmd.exp TESTOUT "test_block_if_eof2.cmd.exp" - /* @makedep: test_caret_eof.cmd */ test_caret_eof.cmd TESTCMD "test_caret_eof.cmd"
diff --git a/programs/cmd/tests/test_block_if_eof1.cmd b/programs/cmd/tests/test_block_if_eof1.cmd deleted file mode 100644 index 9b2ee2e97f3..00000000000 --- a/programs/cmd/tests/test_block_if_eof1.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -echo Test if with unbalanced parentheses - -if 1 == 1 ( - echo should not be executed diff --git a/programs/cmd/tests/test_block_if_eof1.cmd.exp b/programs/cmd/tests/test_block_if_eof1.cmd.exp deleted file mode 100644 index 419b130e442..00000000000 --- a/programs/cmd/tests/test_block_if_eof1.cmd.exp +++ /dev/null @@ -1 +0,0 @@ -Test if with unbalanced parentheses diff --git a/programs/cmd/tests/test_block_if_eof2.cmd b/programs/cmd/tests/test_block_if_eof2.cmd deleted file mode 100644 index 2c34647a732..00000000000 --- a/programs/cmd/tests/test_block_if_eof2.cmd +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -echo Test if with unbalanced parentheses - -if 1 == 0 ( - echo should not be executed diff --git a/programs/cmd/tests/test_block_if_eof2.cmd.exp b/programs/cmd/tests/test_block_if_eof2.cmd.exp deleted file mode 100644 index 419b130e442..00000000000 --- a/programs/cmd/tests/test_block_if_eof2.cmd.exp +++ /dev/null @@ -1 +0,0 @@ -Test if with unbalanced parentheses diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 35caf136e4c..d72fcf2385a 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1043,6 +1043,19 @@ if 1 == 0 ( @tab@ @space@ ) else echo block containing a line with just spaces seems to work +echo --- if with unbalanced parentheses +echo @echo off>block_if_eof1.cmd +echo echo sanity1>>block_if_eof1.cmd +echo if 1 == 1 (>>block_if_eof1.cmd +echo echo should not be executed>>block_if_eof1.cmd +call block_if_eof1.cmd +del block_if_eof1.cmd +echo @echo off>block_if_eof2.cmd +echo echo sanity2>>block_if_eof2.cmd +echo if 1 == 0 (>>block_if_eof2.cmd +echo echo should not be executed>>block_if_eof2.cmd +call block_if_eof2.cmd +del block_if_eof2.cmd echo --- case sensitivity with and without /i option if bar==BAR echo if does not default to case sensitivity if not bar==BAR echo if seems to default to case sensitivity diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 379225f38e5..145f97a550a 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -710,6 +710,9 @@ windir does exist block containing a line with just spaces seems to work block containing a line with just spaces seems to work block containing a line with just spaces seems to work +--- if with unbalanced parentheses +sanity1 +sanity2 --- case sensitivity with and without /i option if seems to default to case sensitivity if /i seems to work