Google GitGoogle Git
Sign in
pdfium/pdfium.git/refs/heads/chromium/3548^!/.
commit
5fea8ca820be73f6158d3a532b4162871616390e
[log]
author
Henrique Nakashima <hnakashima@chromium.org>
Fri Sep 07 17:13:51 2018 +0000
committer
Chromium commit bot <commit-bot@chromium.org>
Fri Sep 07 17:13:51 2018 +0000
tree
8400ee0d1b155ba2e9bb8fd453524eec9dec2043
parent
26fbb0328d578f15bbbad9271965bee1778b47ed [diff]
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 <rharrison@chromium.org>
Commit-Queue: Henrique Nakashima <hnakashima@chromium.org>

diff --git a/testing/tools/safetynet_compare.py b/testing/tools/safetynet_compare.py
index ef47eab..3c0de03 100755
--- a/testing/tools/safetynet_compare.py
+++ b/testing/tools/safetynet_compare.py

@@ -351,7 +351,8 @@
       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 @@
       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...')