Bug 664090 - Disable test_service_filelog.js on Win opt builds. a=orange

Also use the right preprocessor variable to identify debug builds.

--HG--
extra : rebase_source : 3c7370383770a30c5399002ebce8589d5258b848

services/sync/tests/Makefile.in

@@ -48,5 +48,12 @@ XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
 
+# Preprocessor.py won't recognize DEBUG as defined if you just pass -DDEBUG.
+# See bug 664313. (Also, yay for consistency with DEBUG v. MOZ_DEBUG.)
+SYNCDEFINES=
+ifdef MOZ_DEBUG
+SYNCDEFINES += -DDEBUG=1
+endif
+
 libs:: unit/head_appinfo.js.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $^ > $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/head_appinfo.js
+	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(SYNCDEFINES) $^ > $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/head_appinfo.js

services/sync/tests/unit/head_appinfo.js.in

@@ -60,7 +60,7 @@ addResourceAlias();
 // Some tests hang on OSX debug builds. See bug 604565.
 let DISABLE_TESTS_BUG_604565 = false;
 #ifdef XP_MACOSX
-#ifdef MOZ_DEBUG_SYMBOLS
+#ifdef DEBUG
 DISABLE_TESTS_BUG_604565 = true;
 #endif
 #endif
@@ -70,3 +70,11 @@ let DISABLE_TESTS_BUG_618233 = false;
 #ifdef XP_WIN
 DISABLE_TESTS_BUG_618233 = true;
 #endif
+
+// test_service_login.js persistently fails on Windows opt builds
+let DISABLE_TESTS_BUG_664090 = false;
+#ifdef XP_WIN
+#ifndef DEBUG
+DISABLE_TESTS_BUG_664090 = true;
+#endif
+#endif

services/sync/tests/unit/test_service_filelog.js

@@ -8,6 +8,10 @@ Cu.import("resource://services-sync/log4moz.js");
 const logsdir = FileUtils.getDir("ProfD", ["weave", "logs"], true);
 
 function run_test() {
+  if (DISABLE_TESTS_BUG_664090) {
+    return;
+  }
+
   run_next_test();
 }