From ac5b6e6cd0943f72f5c5219adafd8857c04ec297 Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Thu, 9 Apr 2020 00:24:29 +0000 Subject: [PATCH] Bug 1628200 - Fix config/tests/test_mozbuild_reading.py. r=rstewart Since the test goes through all moz.build files disregarding DIRS and the conditions that may disable directories, in some cases, moz.builds can fail to be evaluated properly because of missing variables in config.status. This time (because it's not the first), it's LLVM_DLLTOOL. After fixing that, it turns out many of the files/directories pointed to by Files() directives were removed or moved. While here, make the test script python3-ready. Differential Revision: https://phabricator.services.mozilla.com/D70157 --HG-- extra : moz-landing-system : lando --- browser/app/winlauncher/freestanding/moz.build | 2 +- config/tests/test_mozbuild_reading.py | 2 +- docshell/test/moz.build | 4 ---- dom/media/moz.build | 2 -- editor/libeditor/moz.build | 3 +++ layout/reftests/moz.build | 6 ------ python/moz.build | 3 +++ third_party/python/moz.build | 9 --------- toolkit/content/moz.build | 15 --------------- toolkit/mozapps/update/tests/moz.build | 2 +- tools/moz.build | 3 --- widget/tests/moz.build | 3 --- 12 files changed, 9 insertions(+), 45 deletions(-) diff --git a/browser/app/winlauncher/freestanding/moz.build b/browser/app/winlauncher/freestanding/moz.build index 01feb1e3dcce..460f8ec4cb0b 100644 --- a/browser/app/winlauncher/freestanding/moz.build +++ b/browser/app/winlauncher/freestanding/moz.build @@ -42,7 +42,7 @@ OS_LIBS += [ 'ntdll_freestanding', ] -if CONFIG['COMPILE_ENVIRONMENT']: +if CONFIG['COMPILE_ENVIRONMENT'] and CONFIG['LLVM_DLLTOOL']: GeneratedFile( '%sntdll_freestanding.%s' % (CONFIG['LIB_PREFIX'], CONFIG['LIB_SUFFIX']), diff --git a/config/tests/test_mozbuild_reading.py b/config/tests/test_mozbuild_reading.py index 03fc991d7da2..6bacf5d79974 100644 --- a/config/tests/test_mozbuild_reading.py +++ b/config/tests/test_mozbuild_reading.py @@ -78,7 +78,7 @@ class TestMozbuildReading(unittest.TestCase): try: config = mb.config_environment except Exception as e: - if e.message == 'config.status not available. Run configure.': + if str(e) == 'config.status not available. Run configure.': raise unittest.SkipTest('failing without config.status') raise diff --git a/docshell/test/moz.build b/docshell/test/moz.build index e797f80e9fd2..d3abe3f1464d 100644 --- a/docshell/test/moz.build +++ b/docshell/test/moz.build @@ -58,10 +58,6 @@ with Files('chrome/*690056*'): with Files('chrome/*92598*'): BUG_COMPONENT = ('Core', 'Networking: HTTP') -with Files('chrome/*private_hidden_window*'): - BUG_COMPONENT = ('Firefox', 'Private Browsing') - - with Files('iframesandbox/**'): BUG_COMPONENT = ('Core', 'Security') diff --git a/dom/media/moz.build b/dom/media/moz.build index 3c02e551390d..5c9d0270bd8a 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -24,8 +24,6 @@ with Files('IdpSandbox.jsm'): BUG_COMPONENT = component_signaling with Files('PeerConnection*'): BUG_COMPONENT = component_signaling -with Files('RTC*'): - BUG_COMPONENT = component_signaling component_av = ('Core', 'WebRTC: Audio/Video') with Files('GetUserMedia*'): diff --git a/editor/libeditor/moz.build b/editor/libeditor/moz.build index 9c6052be100e..e3aa2341adf7 100644 --- a/editor/libeditor/moz.build +++ b/editor/libeditor/moz.build @@ -91,3 +91,6 @@ FINAL_LIBRARY = 'xul' if CONFIG['CC_TYPE'] in ('clang', 'gcc'): CXXFLAGS += ['-Wno-error=shadow'] + +with Files("tests/*1151186*"): + BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling") diff --git a/layout/reftests/moz.build b/layout/reftests/moz.build index b69cb2253276..e4483a2279a5 100644 --- a/layout/reftests/moz.build +++ b/layout/reftests/moz.build @@ -242,12 +242,6 @@ with Files('view-source/**'): BUG_COMPONENT = ('Core', 'DOM: HTML Parser') with Files('w3c-css/**'): BUG_COMPONENT = ('Core', 'Layout') -with Files('w3c-css/received/css-conditional/**'): - BUG_COMPONENT = ('Core', 'CSS Parsing and Computation') -with Files('w3c-css/received/css-namespaces/**'): - BUG_COMPONENT = ('Core', 'CSS Parsing and Computation') -with Files('w3c-css/received/css-values/**'): - BUG_COMPONENT = ('Core', 'CSS Parsing and Computation') with Files('w3c-css/submitted/conditional3/**'): BUG_COMPONENT = ('Core', 'CSS Parsing and Computation') with Files('w3c-css/submitted/css21/**'): diff --git a/python/moz.build b/python/moz.build index e41e61b4273b..3d53a99a9177 100644 --- a/python/moz.build +++ b/python/moz.build @@ -14,6 +14,9 @@ with Files('devtools/**'): with Files('gdbpp/**'): BUG_COMPONENT = ('Firefox Build System', 'General') +with Files('lldbutils/**'): + BUG_COMPONENT = ('Core', 'General') + with Files('mach/**'): BUG_COMPONENT = ('Firefox Build System', 'Mach Core') diff --git a/third_party/python/moz.build b/third_party/python/moz.build index f744ff9345bf..711138c413b2 100644 --- a/third_party/python/moz.build +++ b/third_party/python/moz.build @@ -20,9 +20,6 @@ with Files('blessings/**'): with Files('compare-locales/**'): BUG_COMPONENT = ('Localization Infrastructure and Tools', 'compare-locales') -with Files('configobj/**'): - BUG_COMPONENT = ('Firefox Build System', 'General') - with Files('dlmanager/**'): BUG_COMPONENT = ('Firefox Build System', 'General') @@ -35,9 +32,6 @@ with Files('futures/**'): with Files('jsmin/**'): BUG_COMPONENT = ('GeckoView', 'General') -with Files('lldbutils/**'): - BUG_COMPONENT = ('Core', 'General') - with Files('mock-1.0.0/**'): BUG_COMPONENT = ('Firefox Build System', 'General') @@ -97,6 +91,3 @@ with Files('virtualenv/**'): with Files('voluptuous/**'): BUG_COMPONENT = ('Firefox Build System', 'Task Configuration') - -with Files('which/**'): - BUG_COMPONENT = ('Firefox Build System', 'General') diff --git a/toolkit/content/moz.build b/toolkit/content/moz.build index 32029df0434e..7409954a186b 100644 --- a/toolkit/content/moz.build +++ b/toolkit/content/moz.build @@ -59,15 +59,9 @@ with Files('aboutwebrtc/*'): with Files('gmp-sources/*'): BUG_COMPONENT = ('Toolkit', 'General') -with Files('tests/browser/browser_audio*'): - BUG_COMPONENT = ('Core', 'Audio/Video: Playback') - with Files('tests/browser/browser_*autoplay*'): BUG_COMPONENT = ('Core', 'Audio/Video: Playback') -with Files('tests/browser/*block*'): - BUG_COMPONENT = ('Core', 'Audio/Video: Playback') - with Files('tests/browser/*silent*'): BUG_COMPONENT = ('Core', 'Audio/Video: Playback') @@ -128,9 +122,6 @@ with Files('tests/chrome/*drop*'): with Files('tests/chrome/*1048178*'): BUG_COMPONENT = ('Core', 'XUL') -with Files('tests/chrome/*253481*'): - BUG_COMPONENT = ('Core', 'DOM: Editor') - with Files('tests/chrome/*263683*'): BUG_COMPONENT = ('Toolkit', 'Find Toolbar') @@ -168,9 +159,6 @@ with Files('tests/chrome/*557987*'): with Files('tests/chrome/*562554*'): BUG_COMPONENT = ('Firefox', 'Menus') -with Files('tests/chrome/*570192*'): - BUG_COMPONENT = ('Firefox', 'Session Restore') - with Files('tests/chrome/*findbar*'): BUG_COMPONENT = ('Toolkit', 'Find Toolbar') @@ -183,9 +171,6 @@ with Files('tests/mochitest/*autocomplete*'): with Files('tests/mochitest/*mousecapture*'): BUG_COMPONENT = ('Core', 'DOM: UI Events & Focus Handling') -with Files('tests/reftests/*multiline*'): - BUG_COMPONENT = ('Core', 'XBL') - with Files('tests/reftests/*videocontrols*'): BUG_COMPONENT = ('Toolkit', 'Video/Audio Controls') diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build index 68560cdc6117..669fb13f060b 100644 --- a/toolkit/mozapps/update/tests/moz.build +++ b/toolkit/mozapps/update/tests/moz.build @@ -104,5 +104,5 @@ FINAL_TARGET_PP_FILES += [ 'data/xpcshellConstantsPP.js', ] -with Files("browser/browser_telemetry_updatePing_ready.js"): +with Files("browser/browser_telemetry_updatePing_*_ready.js"): BUG_COMPONENT = ("Toolkit", "Telemetry") diff --git a/tools/moz.build b/tools/moz.build index 604b2bbe720f..646994edcd54 100644 --- a/tools/moz.build +++ b/tools/moz.build @@ -58,9 +58,6 @@ with Files("vcs/**"): SPHINX_TREES['moztreedocs'] = 'moztreedocs/docs' -with Files('lint/docs/**'): - SCHEDULES.exclusive = ['docs'] - SPHINX_TREES['try'] = 'tryselect/docs' SPHINX_TREES['fuzzing'] = 'fuzzing/docs' diff --git a/widget/tests/moz.build b/widget/tests/moz.build index 68316e997829..2856cab0ca2a 100644 --- a/widget/tests/moz.build +++ b/widget/tests/moz.build @@ -19,9 +19,6 @@ with Files("TestAppShellSteadyState.cpp"): with Files("TestChromeMargin.cpp"): BUG_COMPONENT = ("Core", "Widget: Win32") -with Files("*1151186*"): - BUG_COMPONENT = ("Core", "DOM: UI Events & Focus Handling") - with Files("*413277*"): BUG_COMPONENT = ("Core", "Widget: Cocoa")