[ews-build] Make layout-tests' full_results.json accessible in Buildbot
authoraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jul 2019 16:59:22 +0000 (16:59 +0000)
committeraakash_jain@apple.com <aakash_jain@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Jul 2019 16:59:22 +0000 (16:59 +0000)
https://bugs.webkit.org/show_bug.cgi?id=199743

Reviewed by Jonathan Bedard.

* BuildSlaveSupport/ews-build/steps.py:
* BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@247389 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/BuildSlaveSupport/ews-build/steps.py
Tools/BuildSlaveSupport/ews-build/steps_unittest.py
Tools/ChangeLog

index 71c75df..d16b14a 100644 (file)
@@ -833,6 +833,8 @@ class RunWebKitTests(shell.Test):
     description = ['layout-tests running']
     descriptionDone = ['layout-tests']
     resultDirectory = 'layout-test-results'
+    jsonFileName = 'layout-test-results/full_results.json'
+    logfiles = {'json': jsonFileName}
     command = ['python', 'Tools/Scripts/run-webkit-tests',
                '--no-build',
                '--no-new-test-results',
index 658d867..aa77223 100644 (file)
@@ -955,6 +955,7 @@ class TestRunJavaScriptCoreTestsToT(BuildStepMixinAdditions, unittest.TestCase):
 class TestRunWebKitTests(BuildStepMixinAdditions, unittest.TestCase):
     def setUp(self):
         self.longMessage = True
+        self.jsonFileName = 'layout-test-results/full_results.json'
         return self.setUpBuildStep()
 
     def tearDown(self):
@@ -966,6 +967,7 @@ class TestRunWebKitTests(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('configuration', 'release')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
+                        logfiles={'json': self.jsonFileName},
                         command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
                         )
             + 0,
@@ -979,6 +981,7 @@ class TestRunWebKitTests(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('configuration', 'release')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
+                        logfiles={'json': self.jsonFileName},
                         command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
                         )
             + ExpectShell.log('stdio', stdout='9 failures found.')
@@ -991,6 +994,7 @@ class TestRunWebKitTests(BuildStepMixinAdditions, unittest.TestCase):
 class TestRunWebKit1Tests(BuildStepMixinAdditions, unittest.TestCase):
     def setUp(self):
         self.longMessage = True
+        self.jsonFileName = 'layout-test-results/full_results.json'
         return self.setUpBuildStep()
 
     def tearDown(self):
@@ -1002,6 +1006,7 @@ class TestRunWebKit1Tests(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('configuration', 'debug')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
+                        logfiles={'json': self.jsonFileName},
                         command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--debug', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
                         )
             + 0,
@@ -1015,6 +1020,7 @@ class TestRunWebKit1Tests(BuildStepMixinAdditions, unittest.TestCase):
         self.setProperty('configuration', 'release')
         self.expectRemoteCommands(
             ExpectShell(workdir='wkdir',
+                        logfiles={'json': self.jsonFileName},
                         command=['python', 'Tools/Scripts/run-webkit-tests', '--no-build', '--no-new-test-results', '--no-show-results', '--exit-after-n-failures', '30', '--skip-failing-tests', '--release', '--dump-render-tree', '--results-directory', 'layout-test-results', '--debug-rwt-logging'],
                         )
             + ExpectShell.log('stdio', stdout='9 failures found.')
index 3037a9c..dfa3d67 100644 (file)
@@ -1,3 +1,13 @@
+2019-07-12  Aakash Jain  <aakash_jain@apple.com>
+
+        [ews-build] Make layout-tests' full_results.json accessible in Buildbot
+        https://bugs.webkit.org/show_bug.cgi?id=199743
+
+        Reviewed by Jonathan Bedard.
+
+        * BuildSlaveSupport/ews-build/steps.py:
+        * BuildSlaveSupport/ews-build/steps_unittest.py: Updated unit-tests.
+
 2019-07-11  Aakash Jain  <aakash_jain@apple.com>
 
         Unreviewed follow-up fix to r247364.