From 22787a5b4dec8bafd79ee6aa6565a38c4c2b2e5d Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Fri, 20 Dec 2013 19:38:36 -0500 Subject: [PATCH] Bug 948774: Default to not waiting for files from the Nuwa process since it is frozen. r=fabrice --- tools/include/device_utils.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/include/device_utils.py b/tools/include/device_utils.py index c4686b69..3d8df120 100644 --- a/tools/include/device_utils.py +++ b/tools/include/device_utils.py @@ -166,7 +166,8 @@ def notify_and_pull_files(outfiles_prefixes, out_dir, optional_outfiles_prefixes=[], fifo_msg=None, - signal=None): + signal=None, + ignore_nuwa=os.getenv("MOZ_IGNORE_NUWA_PROCESS")): '''Send a message to the main B2G process (either by sending it a signal or by writing to a fifo that it monitors) and pull files created as a result. @@ -214,7 +215,10 @@ def notify_and_pull_files(outfiles_prefixes, all_outfiles_prefixes = outfiles_prefixes + optional_outfiles_prefixes - num_expected_files = len(outfiles_prefixes) * (1 + len(child_pids)) + num_expected_responses = 1 + len(child_pids) + if ignore_nuwa: + num_expected_responses -= 1 + num_expected_files = len(outfiles_prefixes) * num_expected_responses _wait_for_remote_files(outfiles_prefixes, num_expected_files, old_files) new_files = _pull_remote_files(all_outfiles_prefixes, old_files, out_dir) if remove_outfiles_from_device: