From 42adb9a3acdf28a25c5be84b33f1bad86c17c7df Mon Sep 17 00:00:00 2001
From: dcubed <unknown>
Date: Wed, 16 May 2012 12:47:27 -0700
Subject: [PATCH] 7169409: enabling ZIP_DEBUGINFO_FILES causes unexpected test
 failures on Windows X86 Summary: Disable ZIP_DEBUGINFO_FILES by default on
 Windows. Reviewed-by: acorn

---
 make/windows/makefiles/defs.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make
index 58e6a606e..a1c88284c 100644
--- a/make/windows/makefiles/defs.make
+++ b/make/windows/makefiles/defs.make
@@ -143,7 +143,9 @@ _JUNK_ := $(shell \
 MAKE_ARGS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)
 
 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
-  ZIP_DEBUGINFO_FILES ?= 1
+  # Disable ZIP_DEBUGINFO_FILES by default because various tests are
+  # failing in nightly when the debug info files are ZIP'ed.
+  ZIP_DEBUGINFO_FILES ?= 0
 else
   ZIP_DEBUGINFO_FILES=0
 endif
-- 
GitLab