From 5fea8ca820be73f6158d3a532b4162871616390e Mon Sep 17 00:00:00 2001 From: Henrique Nakashima Date: Fri, 7 Sep 2018 17:13:51 +0000 Subject: Force gclient sync in safetynet_compare.py. This overwrites deps that are dirty, fixing an issue with deps that are removed in the "after" branch but not in the "before" branch. Change-Id: I1c905dc46522455ad160a6fd57fbab979c42162e Reviewed-on: https://pdfium-review.googlesource.com/42191 Reviewed-by: Ryan Harrison Commit-Queue: Henrique Nakashima --- testing/tools/safetynet_compare.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/tools/safetynet_compare.py b/testing/tools/safetynet_compare.py index ef47eab9cd..3c0de03a61 100755 --- a/testing/tools/safetynet_compare.py +++ b/testing/tools/safetynet_compare.py @@ -351,7 +351,8 @@ class CompareRun(object): cmd.append('--cache-dir=%s' % self.args.cache_dir) RunCommandPropagateErr(cmd, exit_status_on_error=1) - RunCommandPropagateErr(['gclient', 'sync'], exit_status_on_error=1) + RunCommandPropagateErr(['gclient', 'sync', '--force'], + exit_status_on_error=1) PrintErr('Done.') @@ -390,7 +391,8 @@ class CompareRun(object): build_dir: String with path to build directory """ PrintErr('Syncing...') - RunCommandPropagateErr(['gclient', 'sync'], exit_status_on_error=1) + RunCommandPropagateErr(['gclient', 'sync', '--force'], + exit_status_on_error=1) PrintErr('Done.') PrintErr('Building...') -- cgit v1.2.3