From 49d53d95759b304b54d9cd715f05266a9d5362f2 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 28 Nov 2013 15:03:16 +0100
Subject: [PATCH] Bug 925887 - Part b: move mochitests in content/xul/templates
 into manifests; r=jst

---
 content/xul/templates/moz.build                |  2 +-
 content/xul/templates/tests/chrome/Makefile.in | 17 -----------------
 content/xul/templates/tests/chrome/chrome.ini  |  5 +++++
 content/xul/templates/tests/chrome/moz.build   |  8 --------
 4 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 content/xul/templates/tests/chrome/Makefile.in
 delete mode 100644 content/xul/templates/tests/chrome/moz.build

diff --git a/content/xul/templates/moz.build b/content/xul/templates/moz.build
index b80ea7771ab6..18b88fb78372 100644
--- a/content/xul/templates/moz.build
+++ b/content/xul/templates/moz.build
@@ -5,5 +5,5 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 PARALLEL_DIRS += ['public', 'src']
-TEST_TOOL_DIRS += ['tests/chrome']
 
+MOCHITEST_CHROME_MANIFESTS += ['tests/chrome/chrome.ini']
diff --git a/content/xul/templates/tests/chrome/Makefile.in b/content/xul/templates/tests/chrome/Makefile.in
deleted file mode 100644
index 3b89bf3c3f71..000000000000
--- a/content/xul/templates/tests/chrome/Makefile.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-# NOTE: it is important that the first test of the test_tmpl_* tests here use
-#       datasources="rdf:null" to ensure that the real animals.rdf datasource
-#       can be synchronously loaded before the tests run.
-# bugs 742455 and 823470
-ifneq ($(OS_ARCH),WINNT)
-MOCHITEST_CHROME_FILES += \
-		test_bug330010.xul \
-		file_bug330010.rdf \
-		$(NULL)
-endif
-
-# test_bug397148.xul is disabled because it leaks. See bug 879531.
diff --git a/content/xul/templates/tests/chrome/chrome.ini b/content/xul/templates/tests/chrome/chrome.ini
index abc592905ecd..21db61762b51 100644
--- a/content/xul/templates/tests/chrome/chrome.ini
+++ b/content/xul/templates/tests/chrome/chrome.ini
@@ -8,6 +8,11 @@ support-files =
   templates_shared.js
 
 [test_bug329335.xul]
+[test_bug330010.xul]
+skip-if = os == "win"
+support-files = file_bug330010.rdf
+[test_bug397148.xul]
+skip-if = true # Bug 879531
 [test_bug441785.xul]
 [test_bug476634.xul]
 [test_sortservice.xul]
diff --git a/content/xul/templates/tests/chrome/moz.build b/content/xul/templates/tests/chrome/moz.build
deleted file mode 100644
index 87c88dfddbc5..000000000000
--- a/content/xul/templates/tests/chrome/moz.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-MOCHITEST_CHROME_MANIFESTS += ['chrome.ini']
-