GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-05 16:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add tristate option to fix cmd:attrib test (#8344)

Browse Source 
- Add a tristate option to accept either true or false for the bStdOutput and bStdError tests
- Use this new option on the four tests that are inconsistent.
This commit is contained in:
Carl J. Bialorucki
2025-09-25 15:18:24 -05:00
committed by GitHub
parent c687f6e146
commit 4fafe46fc9
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/rostests/apitests/cmd/cmd.c
View File

@@ -22,6 +22,8 @@ typedef struct TEST_ENTRY
const char *ErrorNotContains;
} TEST_ENTRY;
#define TRISTATE 2
static const TEST_ENTRY s_exit_entries[] =
{
{ __LINE__, 0, "cmd /c exit" },
@@ -162,9 +164,9 @@ static const TEST_ENTRY s_attrib_entries[] =
{ __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, " H " },
{ __LINE__, 0, "attrib /S -H attr-te*.txt", FALSE, FALSE },
{ __LINE__, 0, "attrib /S attr-te*.txt", TRUE, FALSE, NULL, NULL, " H " },
{ __LINE__, 0, "attrib /S +H", FALSE, FALSE },
{ __LINE__, 0, "attrib /S +H", TRISTATE, FALSE },
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " },
{ __LINE__, 0, "attrib /S -H", FALSE, FALSE },
{ __LINE__, 0, "attrib /S -H", TRISTATE, FALSE },
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " },
{ __LINE__, 0, "cmd /c if exist attr-test.txt attrib -H attr-test.txt" },
{ __LINE__, 0, "cmd /c if exist attr-test.txt del /Q attr-test.txt" },
@@ -307,10 +309,10 @@ static const TEST_ENTRY s_attrib_entries[] =
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " },
{ __LINE__, 0, "attrib /S -H attr-test.txt", FALSE, FALSE },
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " },
{ __LINE__, 0, "attrib /S +H", FALSE, FALSE },
{ __LINE__, 0, "attrib /S +H", TRISTATE, FALSE },
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, " H " },
{ __LINE__, 0, "attrib /S attr-tes*.*", TRUE, FALSE, " H " },
{ __LINE__, 0, "attrib /S -H", FALSE, FALSE },
{ __LINE__, 0, "attrib /S -H", TRISTATE, FALSE },
{ __LINE__, 0, "attrib /S attr-test.txt", TRUE, FALSE, NULL, NULL, " H " },
{ __LINE__, 0, "attrib /S attr-tes*.*", TRUE, FALSE, NULL, NULL, " H " },
{ __LINE__, 0, "cmd /c if exist attr-dir/dir1/test.txt attrib -H attr-dir/dir1/test.txt" },
@@ -455,11 +457,11 @@ static void DoTestEntry(const TEST_ENTRY *pEntry)
if (si.hStdError)
CloseHandle(si.hStdError);
ok(pEntry->bStdOutput == bStdOutput,
ok(pEntry->bStdOutput == bStdOutput || pEntry->bStdOutput == TRISTATE,
"Line %u: bStdOutput %d vs %d\n",
pEntry->line, pEntry->bStdOutput, bStdOutput);
ok(pEntry->bStdError == bStdError,
ok(pEntry->bStdError == bStdError || pEntry->bStdOutput == TRISTATE,
"Line %u: bStdError %d vs %d\n",
pEntry->line, pEntry->bStdError, bStdError);