[ews-build] Split iOS layout test queue into no-WPT / only-WPT config…

…urations

https://bugs.webkit.org/show_bug.cgi?id=254559
rdar://107291888

Unreviewed follow-up.

262714@main caused additional arguments to be removed by the RunWebKitTests class, this
should only have been done for the RunWebKitTestsInStressMode class.

* Tools/CISupport/ews-build/steps.py:
(RunWebKitTests.setLayoutTestCommand):
(RunWebKitTestsInStressMode.setLayoutTestCommand):
* Tools/CISupport/ews-build/steps_unittest.py:
(test_success_additional_arguments): Add a test to ensure additional arguments are
preserved in RunWebKitTests.

Canonical link: https://commits.webkit.org/262727@main

Tools/CISupport/ews-build/steps.py

@@ -3337,9 +3337,6 @@ def setLayoutTestCommand(self):
             self.setCommand(self.command + ['--enable-core-dumps-nolimit'])
 
         if additionalArguments:
-            for argument in ["--child-process=5", "--exclude-tests", "imported/w3c/web-platform-tests"]:
-                if argument in additionalArguments:
-                    additionalArguments.remove(argument)
             self.setCommand(self.command + additionalArguments)
 
         if self.ENABLE_GUARD_MALLOC:
@@ -3532,6 +3529,11 @@ def __init__(self, num_iterations=100):
     def setLayoutTestCommand(self):
         RunWebKitTests.setLayoutTestCommand(self)
 
+        # To support stress mode with iOS layout tests in a WPT / no-WPT configuration, we need to remove these arguments.
+        for argument in ["--child-process=5", "--exclude-tests", "imported/w3c/web-platform-tests"]:
+            if argument in self.command:
+                self.command.remove(argument)
+
         self.setCommand(self.command + ['--iterations', self.num_iterations])
         modified_tests = self.getProperty('modified_tests')
         if modified_tests:

Tools/CISupport/ews-build/steps_unittest.py

@@ -1901,6 +1901,22 @@ def test_warnings(self):
         self.expectOutcome(result=WARNINGS, state_string='2 flakes')
         return self.runStep()
 
+    def test_success_additional_arguments(self):
+        self.configureStep()
+        self.setProperty('fullPlatform', 'ios-simulator')
+        self.setProperty('configuration', 'release')
+        self.setProperty('additionalArguments', ['--exclude-tests', 'imported/w3c/web-platform-tests'])
+        self.expectRemoteCommands(
+            ExpectShell(workdir='wkdir',
+                        logfiles={'json': self.jsonFileName},
+                        logEnviron=False,
+                        command=['python3', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-show-results', '--no-new-test-results', '--clobber-old-results', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging', '--exit-after-n-failures', '60', '--skip-failing-tests', '--exclude-tests', 'imported/w3c/web-platform-tests'],
+                        )
+            + 0,
+        )
+        self.expectOutcome(result=SUCCESS, state_string='Passed layout tests')
+        return self.runStep()
+
     def test_skip_for_revert_patches_on_commit_queue(self):
         self.configureStep()
         self.setProperty('buildername', 'Commit-Queue')