Diff
Modified: trunk/Tools/CISupport/build-webkit-org/loadConfig_unittest.py (275017 => 275018)
--- trunk/Tools/CISupport/build-webkit-org/loadConfig_unittest.py 2021-03-25 13:42:33 UTC (rev 275017)
+++ trunk/Tools/CISupport/build-webkit-org/loadConfig_unittest.py 2021-03-25 13:44:39 UTC (rev 275018)
@@ -39,6 +39,11 @@
cwd = os.path.dirname(os.path.abspath(__file__))
loadConfig.loadBuilderConfig({}, is_test_mode_enabled=True, master_prefix_path=cwd)
+ def test_tab_character(self):
+ cwd = os.path.dirname(os.path.abspath(__file__))
+ with open(os.path.join(cwd, 'config.json'), 'r') as config:
+ self.assertTrue('\t' not in config.read(), 'Tab character found in config.json, please use spaces instead of tabs.')
+
def test_builder_keys(self):
config = self.get_config()
valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
Modified: trunk/Tools/CISupport/ews-build/config.json (275017 => 275018)
--- trunk/Tools/CISupport/ews-build/config.json 2021-03-25 13:42:33 UTC (rev 275017)
+++ trunk/Tools/CISupport/ews-build/config.json 2021-03-25 13:44:39 UTC (rev 275018)
@@ -533,7 +533,7 @@
"architectures": ["i386"],
"workernames": ["ews164", "ews165", "ews166"]
},
- {
+ {
"name": "tvOS-14-Build-EWS",
"shortname": "tv",
"icon": "buildOnly",
@@ -604,7 +604,7 @@
"triggers": ["jsc-tests-mipsel-tests-ews"],
"workernames": ["igalia-jsc32-mipsel-ews", "igalia-jsc32-mipsel-ews-03"]
},
- {
+ {
"name": "JSC-MIPSEL-32bits-Tests-EWS",
"shortname": "jsc-mips-tests",
"icon": "testOnly",
Modified: trunk/Tools/CISupport/ews-build/loadConfig_unittest.py (275017 => 275018)
--- trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-03-25 13:42:33 UTC (rev 275017)
+++ trunk/Tools/CISupport/ews-build/loadConfig_unittest.py 2021-03-25 13:44:39 UTC (rev 275018)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
#
-# Copyright (C) 2018-2020 Apple Inc. All rights reserved.
+# Copyright (C) 2018-2021 Apple Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -44,6 +44,11 @@
cwd = os.path.dirname(os.path.abspath(__file__))
loadConfig.loadBuilderConfig({}, is_test_mode_enabled=True, master_prefix_path=cwd)
+ def test_tab_character(self):
+ cwd = os.path.dirname(os.path.abspath(__file__))
+ with open(os.path.join(cwd, 'config.json'), 'r') as config:
+ self.assertTrue('\t' not in config.read(), 'Tab character found in config.json, please use spaces instead of tabs.')
+
def test_builder_keys(self):
config = self.get_config()
valid_builder_keys = ['additionalArguments', 'architectures', 'builddir', 'configuration', 'description',
Modified: trunk/Tools/ChangeLog (275017 => 275018)
--- trunk/Tools/ChangeLog 2021-03-25 13:42:33 UTC (rev 275017)
+++ trunk/Tools/ChangeLog 2021-03-25 13:44:39 UTC (rev 275018)
@@ -1,3 +1,16 @@
+2021-03-25 Aakash Jain <aakash_j...@apple.com>
+
+ [ews] Add unit-test to ensure that config.json doesn't have tab characters
+ https://bugs.webkit.org/show_bug.cgi?id=223440
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/build-webkit-org/loadConfig_unittest.py:
+ (ConfigDotJSONTest.test_tab_character): Unit-test to ensure that there are no tab characters.
+ * CISupport/ews-build/config.json:
+ * CISupport/ews-build/loadConfig_unittest.py:
+ (ConfigDotJSONTest.test_tab_character):
+
2021-03-25 Commit Queue <commit-qu...@webkit.org>
Unreviewed, reverting r274826 and r274968.
