ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmd: Added @or_broken@ handling to test templates and use it to fix tests on win2k.

Browse Source
This commit is contained in:
Jacek Caban 2010-03-18 01:28:19 +01:00 committed by Alexandre Julliard
parent e7615e004a
commit e486a02157
3 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
programs/cmd/tests/batch.c
View File

@ -101,9 +101,11 @@ static const char *compare_line(const char *out_line, const char *out_end, const
const char *exp_end) const char *exp_end)
{ {
const char *out_ptr = out_line, *exp_ptr = exp_line; const char *out_ptr = out_line, *exp_ptr = exp_line;
const char *err = NULL;
static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char pwd_cmd[] = {'@','p','w','d','@'};
static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'}; static const char todo_space_cmd[] = {'@','t','o','d','o','_','s','p','a','c','e','@'};
static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'};
while(exp_ptr < exp_end) { while(exp_ptr < exp_end) {
if(*exp_ptr == '@') { if(*exp_ptr == '@') {
@ -111,11 +113,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const
&& !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) { && !memcmp(exp_ptr, pwd_cmd, sizeof(pwd_cmd))) {
exp_ptr += sizeof(pwd_cmd); exp_ptr += sizeof(pwd_cmd);
if(out_end-out_ptr < workdir_len if(out_end-out_ptr < workdir_len
|| (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len, || (CompareStringA(LOCALE_SYSTEM_DEFAULT, NORM_IGNORECASE, out_ptr, workdir_len,
workdir, workdir_len) != CSTR_EQUAL)) workdir, workdir_len) != CSTR_EQUAL)) {
return out_ptr; err = out_ptr;
out_ptr += workdir_len; }else {
continue; out_ptr += workdir_len;
continue;
}
}else if(exp_ptr+sizeof(todo_space_cmd) <= exp_end }else if(exp_ptr+sizeof(todo_space_cmd) <= exp_end
&& !memcmp(exp_ptr, todo_space_cmd, sizeof(todo_space_cmd))) { && !memcmp(exp_ptr, todo_space_cmd, sizeof(todo_space_cmd))) {
exp_ptr += sizeof(todo_space_cmd); exp_ptr += sizeof(todo_space_cmd);
@ -123,10 +127,31 @@ static const char *compare_line(const char *out_line, const char *out_end, const
if(out_ptr < out_end && *out_ptr == ' ') if(out_ptr < out_end && *out_ptr == ' ')
out_ptr++; out_ptr++;
continue; continue;
}else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end
&& !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) {
exp_ptr = exp_end;
continue;
} }
}else if(out_ptr == out_end || *out_ptr != *exp_ptr) {
err = out_ptr;
} }
if(out_ptr == out_end || *out_ptr != *exp_ptr++)
return out_ptr; if(err) {
if(!broken(1))
return err;
while(exp_ptr+sizeof(or_broken_cmd) <= exp_end && memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd)))
exp_ptr++;
if(!exp_ptr)
return err;
exp_ptr += sizeof(or_broken_cmd);
out_ptr = out_line;
err = NULL;
continue;
}
exp_ptr++;
out_ptr++; out_ptr++;
} }

1
programs/cmd/tests/test_builtins.cmd
View File

@ -23,6 +23,7 @@ cd dummydir
echo %~dp0 echo %~dp0
cd .. cd ..
rmdir dummydir rmdir dummydir
echo CD value %CD%
echo %% echo %%
echo P% echo P%
echo %P echo %P

1
programs/cmd/tests/test_builtins.cmd.exp
View File

@ -16,6 +16,7 @@ bar
~dp0 should be directory containing batch file ~dp0 should be directory containing batch file
@pwd@\ @pwd@\
@pwd@\ @pwd@\
CD value @pwd@@or_broken@CD value
% %
P P
P P