From: Haidong Yu yuhaidong@uniontech.com
Signed-off-by: Haidong Yu yuhaidong@uniontech.com --- programs/cmd/tests/test_cmdline.cmd | 51 ++++++++++++++++++++++++- programs/cmd/tests/test_cmdline.cmd.exp | 16 ++++++++ 2 files changed, 66 insertions(+), 1 deletion(-)
diff --git a/programs/cmd/tests/test_cmdline.cmd b/programs/cmd/tests/test_cmdline.cmd index 8712f05f87d..23584e952fc 100644 --- a/programs/cmd/tests/test_cmdline.cmd +++ b/programs/cmd/tests/test_cmdline.cmd @@ -240,6 +240,55 @@ call say' echo @echo ~ > "say~.bat" call say~
+echo --------- Testing batch with keywords filename -------------- +echo @echo start > start.bat +echo start.bat > test.bat +call test.bat + +echo @echo for > for.bat +echo for.bat > test.bat +call test.bat + +echo @echo more > more.bat +echo more.bat > test.bat +call test.bat + +echo @echo . > echo.bat +echo echo.bat bar > test.bat +call test.bat +del echo.bat +echo.bat + +echo @echo . > .bat +echo .bat > test.bat +call test.bat + +echo @echo echo+ > echo+.bat +echo echo+.bat > test.bat +call test.bat +echo echo+ bar> test.bat +call test.bat +del echo+.bat +call test.bat + +echo @echo echo_ > echo_.bat +echo echo_.bat > test.bat +call test.bat +echo echo_ bar > test.bat +call test.bat + +echo @echo + > +.bat +echo +.bat > test.bat +call test.bat +echo + > test.bat +call test.bat + +echo @echo _ > _.bat +echo _.bat > test.bat +call test.bat +echo _ > test.bat +call test.bat + echo --------- Testing parameter passing -------------- echo @echo 1:%%1,2:%%2 > tell.bat call tell 1 @@ -278,7 +327,7 @@ call tell(1234) call tell(12(34) call tell(12;34) echo --------- Finished -------------- -del tell.bat say*.* bazbaz*.bat +del tell.bat say*.* bazbaz*.bat start.bat test.bat for.bat more.bat echo.bat .bat echo+.bat echo_.bat +.bat _.bat exit :setError exit /B %1 diff --git a/programs/cmd/tests/test_cmdline.cmd.exp b/programs/cmd/tests/test_cmdline.cmd.exp index 946e353fcf3..b8b344c9b1f 100644 --- a/programs/cmd/tests/test_cmdline.cmd.exp +++ b/programs/cmd/tests/test_cmdline.cmd.exp @@ -121,6 +121,22 @@ bar@space@ 0@space@ '@space@ ~@space@ +--------- Testing batch with keywords filename -------------- +start@space@ +for@space@ +more@space@ +.@space@ +bat@space@ +.@space@ +echo+@space@ +echo+@space@ +@space@bar@space@ +echo_@space@ +echo_@space@ ++@space@ ++@space@ +_@space@ +_@space@ --------- Testing parameter passing -------------- 1:1,2:@space@ 1:(1),2:@space@
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=143735
Your paranoid android.
=== w7u_2qxl (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w7u_adm (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w7u_el (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w8 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w8adm (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w864 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064v1507 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064v1809 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064_tsign (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64_en_AE_u8 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w11pro64 (32 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w7pro64 (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w864 (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064v1507 (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064v1809 (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064_2qxl (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064_adm (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w1064_tsign (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64 (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64_ar (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64_ja (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w10pro64_zh_CN (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== w11pro64_amd (64 bit report) ===
cmd.exe: batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:310: Test failed: unexpected end of line 133 (got ' bar', wanted '@space@bar@space@')
=== debian11 (32 bit report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x41 position 0 in line 125 (got 'Application could not be started, or no application associated with the specified file.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx failed: File not found.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit ar:MA report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0xffffffe9 position 0 in line 125 (got '�� ����� ������� �� ����� ? �� ��� �� ���� ������ �� ��� ������� �������.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0xffffffe5 position 0 in line 126 (got '��� �������: ����� ��� �����.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit de report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x45 position 0 in line 125 (got 'Es konnte keine Anwendung gestartet werden, oder es ist keine Anwendung mit der angegebenen Datei verkn�pft.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx fehlgeschlagen: Datei nicht gefunden.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit fr report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x4c position 0 in line 125 (got 'Le programme n'a pas pu �tre lanc�, ou aucun programme n'est associ� au fichier sp�cifi�.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx a �chou�: Fichier introuvable.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit he:IL report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x41 position 0 in line 125 (got 'Application could not be started, or no application associated with the specified file.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx failed: File not found.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit hi:IN report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x41 position 0 in line 125 (got 'Application could not be started, or no application associated with the specified file.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx failed: File not found.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit ja:JP report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0xffffff83 position 0 in line 125 (got '�A�v���P�[�V�������J�n�����������B���������A�w�������t�@�C�����A�v���P�[�V���������A�t�����������������B', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx �����s: �t�@�C�������������������B', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11 (32 bit zh:CN report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0xffffffce position 0 in line 125 (got '����������������������������������������������', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx ����: ������������', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11b (32 bit WoW report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x41 position 0 in line 125 (got 'Application could not be started, or no application associated with the specified file.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx failed: File not found.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
=== debian11b (64 bit WoW report) ===
cmd.exe: batch.c:321: Test failed: unexpected char 0x41 position 0 in line 125 (got 'Application could not be started, or no application associated with the specified file.', wanted 'start@space@') batch.c:321: Test failed: unexpected char 0x53 position 0 in line 126 (got 'ShellExecuteEx failed: File not found.', wanted 'for@space@') batch.c:310: Test failed: unexpected end of line 127 (got '', wanted 'more@space@') batch.c:321: Test failed: unexpected char 0x62 position 0 in line 128 (got 'bat bar ', wanted '.@space@') batch.c:310: Test failed: unexpected end of line 129 (got 'bat', wanted 'bat@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 131 (got '+.bat ', wanted 'echo+@space@') batch.c:321: Test failed: unexpected char 0x2b position 0 in line 132 (got '+ bar', wanted 'echo+@space@') batch.c:310: Test failed: unexpected end of line 133 (got '+ bar', wanted '@space@bar@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 134 (got '_.bat ', wanted 'echo_@space@') batch.c:321: Test failed: unexpected char 0x5f position 0 in line 135 (got '_ bar ', wanted 'echo_@space@')
-
Haidong Yu -
Haidong Yu (＠yhd986)
-
Marvin