2018-09-21 00:30:26 +00:00
|
|
|
From 6b31ce372295634832d0c2aa28534c8f4cc885f3 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Zac Walker <zac.walker@microsoft.com>
|
|
|
|
|
Date: Thu, 20 Sep 2018 17:49:55 -0700
|
|
|
|
|
Subject: ignore_rc_check.patch
|
|
|
|
|
|
|
|
|
|
Dont compare RC.exe and RC.py output.
|
|
|
|
|
FIXME: It has to be reverted once the script is fixed.
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/build/toolchain/win/tool_wrapper.py b/build/toolchain/win/tool_wrapper.py
|
2018-09-21 00:30:26 +00:00
|
|
|
index ee21eb4b194b..ab98a033a61c 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/build/toolchain/win/tool_wrapper.py
|
|
|
|
|
+++ b/build/toolchain/win/tool_wrapper.py
|
2018-09-21 00:30:26 +00:00
|
|
|
@@ -231,7 +231,11 @@ class WinTool(object):
|
2018-09-14 05:02:16 +00:00
|
|
|
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):
|
2018-09-21 00:30:26 +00:00
|
|
|
--
|
|
|
|
|
2.17.0
|
|
|
|
|
|
