Skip to content

Commit 38c16a5

Browse files
authored
Update shell quote E2E test (#11977)
* resolve e2e test
1 parent 8b9960c commit 38c16a5

File tree

1 file changed

+13
-20
lines changed

1 file changed

+13
-20
lines changed

Extension/test/scenarios/SingleRootProject/tests/common.test.ts

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -226,28 +226,21 @@ suite("resolveVariables", () => {
226226
throw new Error(`quoteArgument failure: for \"${input}\", \"${result}\" !== \"${expectedOutput}\"`);
227227
}
228228
};
229-
/*
230-
this is how the args from tasks.json will be sent to the chilprocess.spawn:
231-
"args":[
232-
"-DTEST1=TEST1 TEST1", // "-DTEST1=TEST1 TEST1"
233-
"-DTEST2=\"TEST2 TEST2\"", // -DTEST2="TEST2 TEST2"
234-
"-DTEST3=\\\"TEST3 TEST3\\\"", // "-DTEST3=\"TEST3 TEST3\""
235-
"-DTEST4=TEST4\\ TEST4", // "-DTEST4=TEST4 TEST4"
236-
"-DTEST5='TEST5 TEST5'", // -DTEST5='TEST5 TEST5'
237-
"-DTEST6=TEST6\\ TEST6 Test6", // "-DTEST6=TEST6 TEST6 Test6"
238-
]
239-
*/
240-
testQuoteArgumentScenario(`-DTEST1=TEST1 TEST1`, `"-DTEST1=TEST1 TEST1"`);
241-
testQuoteArgumentScenario(`-DTEST2="TEST2 TEST2"`, `"-DTEST2=\\"TEST2 TEST2\\""`);
242-
testQuoteArgumentScenario(`-DTEST3=\\"TEST3 TEST3\\"`, `"-DTEST3=\\\\\\"TEST3 TEST3\\\\\\""`);
243-
if (process.platform.includes("win")) {
244-
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "\"-DTEST4=TEST4 TEST4\"");
245-
testQuoteArgumentScenario("-DTEST5=\'TEST5 TEST5\'", "-DTEST5=\'TEST5 TEST5\'");
229+
if (os.platform() === 'win32') {
230+
testQuoteArgumentScenario(`-DTEST1=TEST1 TEST1`, `"-DTEST1=TEST1 TEST1"`);
231+
testQuoteArgumentScenario(`-DTEST2="TEST2 TEST2"`, `"-DTEST2=\\"TEST2 TEST2\\""`);
232+
testQuoteArgumentScenario(`-DTEST3=\\"TEST3 TEST3\\"`, `"-DTEST3=\\\\\\"TEST3 TEST3\\\\\\""`);
233+
testQuoteArgumentScenario(`-DTEST4=TEST4\\ TEST4`, `"-DTEST4=TEST4\\ TEST4"`);
234+
testQuoteArgumentScenario(`-DTEST5='TEST5 TEST5'`, `"-DTEST5='TEST5 TEST5'"`);
235+
testQuoteArgumentScenario(`-DTEST6=TEST6\\ TEST6 Test6`, `"-DTEST6=TEST6\\ TEST6 Test6"`);
246236
} else {
247-
testQuoteArgumentScenario("-DTEST4=TEST4\\ TEST4", "-DTEST4=TEST4\\\\ TEST4");
248-
testQuoteArgumentScenario("-DTEST5='TEST5 TEST5'", "-DTEST5='TEST5 TEST5'");
237+
testQuoteArgumentScenario(`-DTEST1=TEST1 TEST1`, `'-DTEST1=TEST1 TEST1'`);
238+
testQuoteArgumentScenario(`-DTEST2="TEST2 TEST2"`, `'-DTEST2="TEST2 TEST2"'`);
239+
testQuoteArgumentScenario(`-DTEST3=\\"TEST3 TEST3\\"`, `'-DTEST3=\\"TEST3 TEST3\\"'`);
240+
testQuoteArgumentScenario(`-DTEST4=TEST4\\ TEST4`, `'-DTEST4=TEST4\\ TEST4'`);
241+
testQuoteArgumentScenario(`-DTEST5='TEST5 TEST5'`, `'-DTEST5='\\''TEST5 TEST5'\\'''`);
242+
testQuoteArgumentScenario(`-DTEST6=TEST6\\ TEST6 Test6`, `'-DTEST6=TEST6\\ TEST6 Test6'`);
249243
}
250-
testQuoteArgumentScenario("-DTEST6=TEST6\\ TEST6 Test6", "\"-DTEST6=TEST6 TEST6 Test6\"");
251244
});
252245

253246
interface ResolveTestFlowEnvironment {

0 commit comments

Comments
 (0)