Bug 1251013 - Update AndroidVersion annotations in test manifests - xpcshell; r=jmaher
authorGeoff Brown <gbrown@mozilla.com>
Thu, 17 Mar 2016 10:00:50 -0600
changeset 289288 cd6d52ddb5751e51c6272b9846144156f8844803
parent 289287 40cc2419d4f7cf15ce04d0efe8e9ead2ce4304da
child 289289 1fdf06c430110676ac5feaf35a0462239b805cff
push id19656
push usergwagner@mozilla.com
push dateMon, 04 Apr 2016 13:43:23 +0000
treeherderb2g-inbound@e99061fde28a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1251013
milestone48.0a1
Bug 1251013 - Update AndroidVersion annotations in test manifests - xpcshell; r=jmaher
image/test/unit/xpcshell.ini
netwerk/test/httpserver/test/xpcshell.ini
--- a/image/test/unit/xpcshell.ini
+++ b/image/test/unit/xpcshell.ini
@@ -30,18 +30,18 @@ support-files =
   image4gif16x16bmp32bpp.ico
   image4gif32x32bmp24bpp.ico
   image4gif32x32bmp32bpp.ico
   image_load_helpers.js
 
 
 [test_async_notification.js]
 # Bug 1156452: frequent crash on Android 4.3
-skip-if = android_version == "18"
+skip-if = os == "android"
 [test_async_notification_404.js]
 [test_async_notification_animated.js]
 [test_encoder_apng.js]
 [test_encoder_png.js]
 [test_imgtools.js]
-# Bug 676968: test fails consistently on Android; crashes on 4.3 (bug 1156452)
+# Bug 676968
 skip-if = os == "android"
 [test_moz_icon_uri.js]
 [test_private_channel.js]
--- a/netwerk/test/httpserver/test/xpcshell.ini
+++ b/netwerk/test/httpserver/test/xpcshell.ini
@@ -29,10 +29,10 @@ run-sequentially = Reusing same server o
 [test_seizepower.js]
 [test_setindexhandler.js]
 [test_setstatusline.js]
 [test_sjs.js]
 [test_sjs_object_state.js]
 [test_sjs_state.js]
 [test_sjs_throwing_exceptions.js]
 # Bug 1063533: frequent timeouts on Android 4.3
-skip-if = android_version == "18"
+skip-if = os == "android"
 [test_start_stop.js]