build: ignore comparison differences between res files (#657)

electron · Aug 20, 2018 · 00cce7a · 00cce7a
1 parent 7e5528d
commit 00cce7a
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/patches/common/chromium/.patches.yaml b/patches/common/chromium/.patches.yaml
@@ -412,3 +412,9 @@ patches:
   file: enable_osr_components.patch
   description: |
     Add MouseWheelPhaseHandler for OSR.
+-
+  author: Zac Walker <zac.walker@microsoft.com>
+  file: ignore_rc_check.patch
+  description: |
+    Dont compare RC.exe and RC.py output.
+    FIXME: It has to be reverted once the script is fixed.
diff --git a/patches/common/chromium/ignore_rc_check.patch b/patches/common/chromium/ignore_rc_check.patch
@@ -0,0 +1,17 @@
+diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
+index a76e926a8681..c43839a01211 100644
+--- a/build/toolchain/win/tool_wrapper.py
++++ b/build/toolchain/win/tool_wrapper.py
+@@ -258,7 +258,11 @@ class WinTool(object):
+       if rc_exe_exit_code == 0:
+         import filecmp
+         # Strip "/fo" prefix.
+-        assert filecmp.cmp(rc_res_output[3:], rcpy_res_output[3:])
++        # ------
++        # Temporarily ignore compares
++        # Nightly builds use very large version numbers that fail this check
++        # FIXME(zacwalk): Enable the assert.
++        # assert filecmp.cmp(rc_res_output[3:], rcpy_res_output[3:])
+     return rc_exe_exit_code
+
+   def ExecActionWrapper(self, arch, rspfile, *dirname):