Bug 658928 - Use the xpcshell manifest to disable tests. r=rnewman

--HG--
rename : services/sync/tests/unit/head_appinfo.js.in => services/sync/tests/unit/head_appinfo.js

services/sync/tests/Makefile.in

@@ -47,6 +47,3 @@ MODULE = test_services_sync
 XPCSHELL_TESTS = unit
 
 include $(topsrcdir)/config/rules.mk
-
-libs:: unit/head_appinfo.js.in
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) $^ > $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/head_appinfo.js

services/sync/tests/unit/head_appinfo.js

@@ -55,26 +55,3 @@ function addResourceAlias() {
   resProt.setSubstitution("services-crypto", uri);
 }
 addResourceAlias();
-
-
-// Some tests hang on OSX debug builds. See bug 604565.
-let DISABLE_TESTS_BUG_604565 = false;
-#ifdef XP_MACOSX
-#ifdef DEBUG
-DISABLE_TESTS_BUG_604565 = true;
-#endif
-#endif
-
-// test_jpakeclient.js produces random failures on Windows 7
-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_jpakeclient.js

@@ -112,9 +112,6 @@ const DATA = {"msg": "eggstreamly sekrit"};
 const POLLINTERVAL = 50;
 
 function run_test() {
-  if (DISABLE_TESTS_BUG_618233)
-    return;
-
   Svc.Prefs.set("jpake.serverURL", "http://localhost:8080/");
   Svc.Prefs.set("jpake.pollInterval", POLLINTERVAL);
   Svc.Prefs.set("jpake.maxTries", 5);

services/sync/tests/unit/test_service_filelog.js

@@ -8,10 +8,6 @@ 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();
 }
 

services/sync/tests/unit/test_service_sync_checkServerError.js

@@ -305,9 +305,6 @@ add_test(function test_engine_applyFailed() {
 
 
 function run_test() {
-  if (DISABLE_TESTS_BUG_604565)
-    return;
-
   Engines.register(CatapultEngine);
   run_next_test();
 }

services/sync/tests/unit/test_service_sync_remoteSetup.js

@@ -6,9 +6,6 @@ Cu.import("resource://services-sync/record.js");
 Cu.import("resource://services-sync/log4moz.js");
 
 function run_test() {
-  if (DISABLE_TESTS_BUG_604565)
-    return;
-
   let logger = Log4Moz.repository.rootLogger;
   Log4Moz.repository.rootLogger.addAppender(new Log4Moz.DumpAppender());
 

services/sync/tests/unit/test_service_sync_updateEnabledEngines.js

@@ -386,8 +386,5 @@ add_test(function test_dependentEnginesDisabledLocally() {
 });
 
 function run_test() {
-  if (DISABLE_TESTS_BUG_604565)
-    return;
-
   run_next_test();
 }

services/sync/tests/unit/test_syncengine_sync.js

@@ -18,9 +18,6 @@ function cleanAndGo(server) {
 }
 
 function run_test() {
-  if (DISABLE_TESTS_BUG_604565)
-    return;
-
   generateNewKeys();
   run_next_test();
 }

services/sync/tests/unit/xpcshell.ini

@@ -33,6 +33,8 @@ tail =
 [test_hmac_error.js]
 [test_interval_triggers.js]
 [test_jpakeclient.js]
+# Bug 618233: this test produces random failures on Windows 7.
+skip-if = os == "win"
 [test_keys.js]
 [test_load_modules.js]
 [test_log4moz.js]
@@ -57,6 +59,8 @@ tail =
 [test_service_createAccount.js]
 [test_service_detect_upgrade.js]
 [test_service_filelog.js]
+# Bug 664090: this test persistently fails on Windows opt builds.
+skip-if = os == "win" && !debug
 [test_service_login.js]
 [test_service_migratePrefs.js]
 [test_service_passwordUTF8.js]
@@ -66,9 +70,15 @@ tail =
 [test_service_startup.js]
 [test_service_sync_401.js]
 [test_service_sync_checkServerError.js]
+# Bug 604565: this test intermittently hangs on OS X debug builds.
+skip-if = os == "mac" && debug
 [test_service_sync_locked.js]
 [test_service_sync_remoteSetup.js]
+# Bug 604565: this test intermittently hangs on OS X debug builds.
+skip-if = os == "mac" && debug
 [test_service_sync_updateEnabledEngines.js]
+# Bug 604565: this test intermittently hangs on OS X debug builds.
+skip-if = os == "mac" && debug
 [test_service_verifyLogin.js]
 [test_service_wipeClient.js]
 [test_service_wipeServer.js]
@@ -76,6 +86,8 @@ tail =
 [test_status_checkSetup.js]
 [test_syncengine.js]
 [test_syncengine_sync.js]
+# Bug 604565: this test intermittently hangs on OS X debug builds.
+skip-if = os == "mac" && debug
 [test_syncscheduler.js]
 [test_syncstoragerequest.js]
 [test_tab_engine.js]