Bug 971025 - move testing/mochitest/test/test_* to testing/mochitest/test/Harness_sanity. r=ted

--HG--
rename : testing/mochitest/tests/SpecialPowersLoadChromeScript.js => testing/mochitest/tests/Harness_sanity/SpecialPowersLoadChromeScript.js
rename : testing/mochitest/tests/file_SpecialPowersFrame1.html => testing/mochitest/tests/Harness_sanity/file_SpecialPowersFrame1.html
rename : testing/mochitest/tests/test_SimpleTestGetTestFileURL.html => testing/mochitest/tests/Harness_sanity/test_SimpleTestGetTestFileURL.html
rename : testing/mochitest/tests/test_SpecialPowersExtension.html => testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
rename : testing/mochitest/tests/test_SpecialPowersExtension2.html => testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension2.html
rename : testing/mochitest/tests/test_SpecialPowersLoadChromeScript.html => testing/mochitest/tests/Harness_sanity/test_SpecialPowersLoadChromeScript.html
rename : testing/mochitest/tests/test_SpecialPowersPushPermissions.html => testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPermissions.html
rename : testing/mochitest/tests/test_SpecialPowersPushPrefEnv.html => testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPrefEnv.html
rename : testing/mochitest/tests/test_bug362788.xhtml => testing/mochitest/tests/Harness_sanity/test_bug362788.xhtml
rename : testing/mochitest/tests/test_bug816847.html => testing/mochitest/tests/Harness_sanity/test_bug816847.html
rename : testing/mochitest/tests/test_sanity.html => testing/mochitest/tests/Harness_sanity/test_sanity.html
rename : testing/mochitest/tests/test_sanityEventUtils.html => testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
rename : testing/mochitest/tests/test_sanityException.html => testing/mochitest/tests/Harness_sanity/test_sanityException.html
rename : testing/mochitest/tests/test_sanityException2.html => testing/mochitest/tests/Harness_sanity/test_sanityException2.html
rename : testing/mochitest/tests/test_sanitySimpletest.html => testing/mochitest/tests/Harness_sanity/test_sanitySimpletest.html
rename : testing/mochitest/tests/test_sanityWindowSnapshot.html => testing/mochitest/tests/Harness_sanity/test_sanityWindowSnapshot.html
rename : testing/mochitest/tests/test_sanity_cleanup.html => testing/mochitest/tests/Harness_sanity/test_sanity_cleanup.html
rename : testing/mochitest/tests/test_sanity_cleanup2.html => testing/mochitest/tests/Harness_sanity/test_sanity_cleanup2.html

layout/generic/test/mochitest.ini

@@ -86,6 +86,7 @@ support-files = bug633762_iframe.html
 [test_bug904810.html]
 [test_bug938772.html]
 [test_contained_plugin_transplant.html]
+skip-if = os=='win'
 [test_image_selection.html]
 [test_image_selection_2.html]
 [test_invalidate_during_plugin_paint.html]

testing/mochitest/tests/Harness_sanity/mochitest.ini

@@ -0,0 +1,18 @@
+[test_sanity.html]
+[test_sanityException.html]
+[test_sanityException2.html]
+[test_sanityWindowSnapshot.html]
+[test_SpecialPowersExtension.html]
+[test_SpecialPowersExtension2.html]
+support-files = file_SpecialPowersFrame1.html
+[test_SpecialPowersPushPermissions.html]
+[test_SpecialPowersPushPrefEnv.html]
+[test_SimpleTestGetTestFileURL.html]
+[test_SpecialPowersLoadChromeScript.html]
+support-files = SpecialPowersLoadChromeScript.js
+[test_bug816847.html]
+[test_sanity_cleanup.html]
+[test_sanity_cleanup2.html]
+[test_sanityEventUtils.html]
+[test_sanitySimpletest.html]
+

testing/mochitest/tests/Makefile.in

@@ -1,28 +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/.
-
-TEST_FILES = \
-  test_sanity.html \
-  test_sanityException.html \
-  test_sanityException2.html \
-  test_sanityWindowSnapshot.html \
-  test_SpecialPowersExtension.html \
-  test_SpecialPowersExtension2.html \
-  test_SpecialPowersPushPermissions.html \
-  test_SpecialPowersPushPrefEnv.html \
-  file_SpecialPowersFrame1.html \
-  test_SimpleTestGetTestFileURL.html \
-  test_SpecialPowersLoadChromeScript.html \
-  SpecialPowersLoadChromeScript.js \
-  test_bug816847.html \
-  test_sanity_cleanup.html \
-  test_sanity_cleanup2.html \
-  test_sanityEventUtils.html \
-  test_sanitySimpletest.html \
-  $(NULL)
-# Copy the sanity tests into a subdirectory, so the top level is all dirs
-# in the test screen.
-TEST_DEST = $(DEPTH)/_tests/$(relativesrcdir)/Harness_sanity
-INSTALL_TARGETS += TEST

testing/mochitest/tests/moz.build

@@ -9,3 +9,6 @@ PARALLEL_DIRS += [
     'SimpleTest',
     'browser',
 ]
+
+MOCHITEST_MANIFESTS += ['Harness_sanity/mochitest.ini']
+