Bug 1148503 - Test PAC Generator on B2G only. r=mcmanus
authorShian-Yow Wu <swu@mozilla.com>
Thu, 02 Apr 2015 09:17:59 +0800
changeset 267063 98c2ee502511e1f86b1a286f8cc9dcae44612a23
parent 267062 966f9a3fa1f85afb63504b4db19b83c3a93f6c87
child 267064 5da3ebe0e0c567f483d6d6a66e1d57498d1a691a
push id4830
push userjlund@mozilla.com
push dateMon, 29 Jun 2015 20:18:48 +0000
treeherdermozilla-beta@4c2175bb0420 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmcmanus
bugs1148503
milestone40.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 1148503 - Test PAC Generator on B2G only. r=mcmanus
netwerk/test/moz.build
netwerk/test/unit/xpcshell.ini
netwerk/test/unit/xpcshell_b2g.ini
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -8,16 +8,17 @@ TEST_DIRS += ['httpserver']
 
 FAIL_ON_WARNINGS = True
 
 BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
 MOCHITEST_MANIFESTS += ['mochitests/mochitest.ini']
 
 XPCSHELL_TESTS_MANIFESTS += [
     'unit/xpcshell.ini',
+    'unit/xpcshell_b2g.ini',
     'unit_ipc/xpcshell.ini',
 ]
 
 GeckoSimplePrograms([
     'PropertiesTest',
     'ReadNTLM',
     'TestBlockingSocket',
     'TestCallbacks',
--- a/netwerk/test/unit/xpcshell.ini
+++ b/netwerk/test/unit/xpcshell.ini
@@ -1,12 +1,12 @@
 [DEFAULT]
 head = head_channels.js head_cache.js head_cache2.js
 tail =
-skip-if = toolkit == 'gonk'
+skip-if = buildapp == 'b2g'
 support-files =
   data/image.png
   data/system_root.lnk
   data/test_psl.txt
   data/test_readline1.txt
   data/test_readline2.txt
   data/test_readline3.txt
   data/test_readline4.txt
@@ -215,17 +215,16 @@ skip-if = bits != 32
 [test_multipart_streamconv.js]
 [test_multipart_streamconv_missing_lead_boundary.js]
 [test_nestedabout_serialize.js]
 [test_net_addr.js]
 # Bug 732363: test fails on windows for unknown reasons.
 skip-if = os == "win"
 [test_nojsredir.js]
 [test_offline_status.js]
-[test_pac_generator.js]
 [test_parse_content_type.js]
 [test_permmgr.js]
 [test_plaintext_sniff.js]
 [test_post.js]
 [test_private_necko_channel.js]
 [test_private_cookie_changed.js]
 [test_progress.js]
 [test_protocolproxyservice.js]
new file mode 100644
--- /dev/null
+++ b/netwerk/test/unit/xpcshell_b2g.ini
@@ -0,0 +1,8 @@
+[DEFAULT]
+head = head_channels.js head_cache.js head_cache2.js
+tail =
+skip-if = buildapp != 'b2g'
+
+# For bug 1148503.  This is to accommodate non-mozilla-central that didn't
+# include required files for this test.
+[test_pac_generator.js]