Bug 971025 - move testing/mochitest/test/test_* to testing/mochitest/test/Harness_sanity. r=ted
authorJoel Maher <jmaher@mozilla.com>
Wed, 05 Mar 2014 10:32:02 -0500
changeset 189259 f8d98d12013595375f61a60a658fbd6c3deeb734
parent 189258 a136d86479c54fccd88989c3ed78b10c85b01414
child 189260 7373f3e5d57af35ed6ae51fc09c872f54692475a
push id3503
push userraliiev@mozilla.com
push dateMon, 28 Apr 2014 18:51:11 +0000
treeherdermozilla-beta@c95ac01e332e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs971025
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 971025 - move testing/mochitest/test/test_* to testing/mochitest/test/Harness_sanity. r=ted
layout/generic/test/mochitest.ini
testing/mochitest/tests/Harness_sanity/SpecialPowersLoadChromeScript.js
testing/mochitest/tests/Harness_sanity/file_SpecialPowersFrame1.html
testing/mochitest/tests/Harness_sanity/mochitest.ini
testing/mochitest/tests/Harness_sanity/test_SimpleTestGetTestFileURL.html
testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension2.html
testing/mochitest/tests/Harness_sanity/test_SpecialPowersLoadChromeScript.html
testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPermissions.html
testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPrefEnv.html
testing/mochitest/tests/Harness_sanity/test_bug362788.xhtml
testing/mochitest/tests/Harness_sanity/test_bug816847.html
testing/mochitest/tests/Harness_sanity/test_sanity.html
testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
testing/mochitest/tests/Harness_sanity/test_sanityException.html
testing/mochitest/tests/Harness_sanity/test_sanityException2.html
testing/mochitest/tests/Harness_sanity/test_sanitySimpletest.html
testing/mochitest/tests/Harness_sanity/test_sanityWindowSnapshot.html
testing/mochitest/tests/Harness_sanity/test_sanity_cleanup.html
testing/mochitest/tests/Harness_sanity/test_sanity_cleanup2.html
testing/mochitest/tests/Makefile.in
testing/mochitest/tests/SpecialPowersLoadChromeScript.js
testing/mochitest/tests/file_SpecialPowersFrame1.html
testing/mochitest/tests/moz.build
testing/mochitest/tests/test_SimpleTestGetTestFileURL.html
testing/mochitest/tests/test_SpecialPowersExtension.html
testing/mochitest/tests/test_SpecialPowersExtension2.html
testing/mochitest/tests/test_SpecialPowersLoadChromeScript.html
testing/mochitest/tests/test_SpecialPowersPushPermissions.html
testing/mochitest/tests/test_SpecialPowersPushPrefEnv.html
testing/mochitest/tests/test_bug362788.xhtml
testing/mochitest/tests/test_bug816847.html
testing/mochitest/tests/test_sanity.html
testing/mochitest/tests/test_sanityEventUtils.html
testing/mochitest/tests/test_sanityException.html
testing/mochitest/tests/test_sanityException2.html
testing/mochitest/tests/test_sanitySimpletest.html
testing/mochitest/tests/test_sanityWindowSnapshot.html
testing/mochitest/tests/test_sanity_cleanup.html
testing/mochitest/tests/test_sanity_cleanup2.html
--- a/layout/generic/test/mochitest.ini
+++ b/layout/generic/test/mochitest.ini
@@ -81,16 +81,17 @@ support-files = bug633762_iframe.html
 [test_bug784410.html]
 [test_bug785324.html]
 [test_bug791616.html]
 [test_bug831780.html]
 [test_bug841361.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]
 skip-if = toolkit == 'android'
 [test_movement_by_characters.html]
 [test_movement_by_words.html]
 # Disable the caret movement by word test on Linux because the shortcut keys
 # are defined in system level.  So, it depends on the environment.
rename from testing/mochitest/tests/SpecialPowersLoadChromeScript.js
rename to testing/mochitest/tests/Harness_sanity/SpecialPowersLoadChromeScript.js
rename from testing/mochitest/tests/file_SpecialPowersFrame1.html
rename to testing/mochitest/tests/Harness_sanity/file_SpecialPowersFrame1.html
new file mode 100644
--- /dev/null
+++ b/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]
+
rename from testing/mochitest/tests/test_SimpleTestGetTestFileURL.html
rename to testing/mochitest/tests/Harness_sanity/test_SimpleTestGetTestFileURL.html
rename from testing/mochitest/tests/test_SpecialPowersExtension.html
rename to testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension.html
rename from testing/mochitest/tests/test_SpecialPowersExtension2.html
rename to testing/mochitest/tests/Harness_sanity/test_SpecialPowersExtension2.html
rename from testing/mochitest/tests/test_SpecialPowersLoadChromeScript.html
rename to testing/mochitest/tests/Harness_sanity/test_SpecialPowersLoadChromeScript.html
rename from testing/mochitest/tests/test_SpecialPowersPushPermissions.html
rename to testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPermissions.html
rename from testing/mochitest/tests/test_SpecialPowersPushPrefEnv.html
rename to testing/mochitest/tests/Harness_sanity/test_SpecialPowersPushPrefEnv.html
rename from testing/mochitest/tests/test_bug362788.xhtml
rename to testing/mochitest/tests/Harness_sanity/test_bug362788.xhtml
rename from testing/mochitest/tests/test_bug816847.html
rename to testing/mochitest/tests/Harness_sanity/test_bug816847.html
rename from testing/mochitest/tests/test_sanity.html
rename to testing/mochitest/tests/Harness_sanity/test_sanity.html
rename from testing/mochitest/tests/test_sanityEventUtils.html
rename to testing/mochitest/tests/Harness_sanity/test_sanityEventUtils.html
rename from testing/mochitest/tests/test_sanityException.html
rename to testing/mochitest/tests/Harness_sanity/test_sanityException.html
rename from testing/mochitest/tests/test_sanityException2.html
rename to testing/mochitest/tests/Harness_sanity/test_sanityException2.html
rename from testing/mochitest/tests/test_sanitySimpletest.html
rename to testing/mochitest/tests/Harness_sanity/test_sanitySimpletest.html
rename from testing/mochitest/tests/test_sanityWindowSnapshot.html
rename to testing/mochitest/tests/Harness_sanity/test_sanityWindowSnapshot.html
rename from testing/mochitest/tests/test_sanity_cleanup.html
rename to testing/mochitest/tests/Harness_sanity/test_sanity_cleanup.html
rename from testing/mochitest/tests/test_sanity_cleanup2.html
rename to testing/mochitest/tests/Harness_sanity/test_sanity_cleanup2.html
deleted file mode 100644
--- a/testing/mochitest/tests/Makefile.in
+++ /dev/null
@@ -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
--- a/testing/mochitest/tests/moz.build
+++ b/testing/mochitest/tests/moz.build
@@ -4,8 +4,11 @@
 # 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/.
 
 PARALLEL_DIRS += [
     'MochiKit-1.4.2',
     'SimpleTest',
     'browser',
 ]
+
+MOCHITEST_MANIFESTS += ['Harness_sanity/mochitest.ini']
+