From 867cf21fd667f719d66a01f69358818f22681fdf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 1 Apr 2022 04:46:21 -0500 Subject: Fix ppCheck to work in single topsrctree mode --- python/mozbuild/mozbuild/mach_commands.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'python') diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py index 79e06fdda..55da508e4 100644 --- a/python/mozbuild/mozbuild/mach_commands.py +++ b/python/mozbuild/mozbuild/mach_commands.py @@ -547,7 +547,7 @@ class Build(MachCommandBase): if not os.path.exists(ppcheck_script): ppcheck_script = mozpath.join(self.topsrcdir, "platform", "build", "ppCheck.py") else: - ppcheck_script = None + ppcheck_script = mozpath.join(self.topsrcdir, "build", "ppCheck.py") if ppcheck_script: ppcheck_cmd = [which.which("python2.7"), ppcheck_script, ppcheck_path] @@ -555,8 +555,7 @@ class Build(MachCommandBase): if not ppcheck_script or ppcheck_result: print("\nWARNING: Something has gone wrong with the check for un-preprocessed files. " + - "Please manually verify that files are properly preprocessed." + - "\n\nNOTE: If you are building the JavaScript Engine only, then no action is required.") + "Please manually verify that files are properly preprocessed.") return status -- cgit v1.2.3