2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
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.
|
|
|
|
|
|
2019-10-28 22:12:35 +00:00
|
|
|
diff --git a/build/toolchain/win/rc/rc.py b/build/toolchain/win/rc/rc.py
|
2020-01-17 18:41:52 +00:00
|
|
|
index 74761866eecfe4e742af974aab71ec05817c3a6a..91ad9ac4c7d59be0cc95341d61e0e30a23869601 100755
|
2019-10-28 22:12:35 +00:00
|
|
|
--- a/build/toolchain/win/rc/rc.py
|
|
|
|
|
+++ b/build/toolchain/win/rc/rc.py
|
2019-11-05 23:41:20 +00:00
|
|
|
@@ -234,7 +234,10 @@ def CompareToMsRcOutput(preprocessed_output, is_utf8, flags):
|
2019-10-28 22:12:35 +00:00
|
|
|
# Assert Microsoft rc.exe and rc.py produced identical .res files.
|
|
|
|
|
if rc_exe_exit_code == 0:
|
|
|
|
|
import filecmp
|
|
|
|
|
- assert filecmp.cmp(msrc_out, flags.output)
|
|
|
|
|
+ # Temporarily ignore compares
|
|
|
|
|
+ # Nightly builds use very large version numbers that fail this check
|
|
|
|
|
+ # FIXME(zacwalk): Enable the assert.
|
|
|
|
|
+ # assert filecmp.cmp(msrc_out, flags.output)
|
|
|
|
|
return rc_exe_exit_code
|
|
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
|
