Disable two E4X tests that were failing only on platforms using e10s content processes after landing bug 765890. no_r=orange.
authorJason Orendorff <jorendorff@mozilla.com>
Mon, 30 Jul 2012 14:52:02 -0500
changeset 100893 2ed8be848b930cdb0865b7a211d975f53e764775
parent 100892 7ac323ff812e2ff8fd7b35cc1c001cb781424c80
child 100894 f276e0c24f01e6a43471a522f5188441ca517b67
push id12727
push userjorendorff@mozilla.com
push dateMon, 30 Jul 2012 20:06:03 +0000
treeherdermozilla-inbound@2ed8be848b93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs765890
milestone17.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
Disable two E4X tests that were failing only on platforms using e10s content processes after landing bug 765890. no_r=orange.
js/xpconnect/tests/mochitest/Makefile.in
--- a/js/xpconnect/tests/mochitest/Makefile.in
+++ b/js/xpconnect/tests/mochitest/Makefile.in
@@ -32,33 +32,31 @@ MOCHITEST_FILES =	bug500931_helper.html 
 		test_bug500691.html \
 		test_bug502959.html \
 		test_bug503926.html \
 		test_bug504877.html \
 		test_bug505915.html \
 		file_bug505915.html \
 		test_bug553407.html \
 		test_bug560351.html \
-		test_bug564330.html \
 		test_frameWrapping.html \
 		test_bug585745.html \
 		test_bug589028.html \
 		test_bug628410.html \
 		bug589028_helper.html \
 		test_bug605167.html \
 		test_bug623437.html \
 		test_bug601299.html \
 		test_bug628794.html \
 		test_bug629227.html \
 		file1_bug629227.html \
 		file2_bug629227.html \
 		test_bug629331.html \
 		test1_bug629331.html \
 		test2_bug629331.html \
-		test_bug618017.html \
 		test_bug636097.html \
 		test_bug661980.html \
 		test_bug650273.html \
 		file_bug650273.html \
 		file_bug658560.html \
 		test_bug655297.html \
 		test_bug691059.html \
 		file_bug706301.html \
@@ -78,14 +76,16 @@ MOCHITEST_FILES =	bug500931_helper.html 
 MOCHITEST_CHROME_FILES	= \
 		test_bug361111.xul \
 		test_bug760131.html \
 		$(NULL)
 
 ifneq ($(OS_TARGET),Android)
 ifndef MOZ_PLATFORM_MAEMO
 MOCHITEST_FILES +=	test_bug657267.html \
-		bug657267.jar
+		bug657267.jar \
+		test_bug564330.html \
+		test_bug618017.html
 endif
 endif
 
 include $(topsrcdir)/config/rules.mk