mozilla-central: changeset 403390:0d4283f23786d00725f7193bde04de7cdc80af02

author	Rob Wood <rwood@mozilla.com>
	Fri, 09 Feb 2018 09:01:25 -0500
changeset 403390	0d4283f23786d00725f7193bde04de7cdc80af02
parent 403389	1c6f14a7398b411846afe0a33df26bc782bf86a9
child 403391	d6e62f28bb6085c1caacd2342303f07d75262dba
push id	33432
push user	aciure@mozilla.com
push date	Mon, 12 Feb 2018 22:07:25 +0000
treeherder	mozilla-central@a0afa134baa3 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ochameau
bugs	1437028
milestone	60.0a1
first release with	nightly linux32 38b3c1d03a59 / 60.0a1 / 20180213100127 / files nightly linux64 38b3c1d03a59 / 60.0a1 / 20180213100127 / files nightly mac 38b3c1d03a59 / 60.0a1 / 20180213100127 / files nightly win32 38b3c1d03a59 / 60.0a1 / 20180213100127 / files nightly win64 38b3c1d03a59 / 60.0a1 / 20180213100127 / files
last release without	nightly linux32 9a0655ea8ae0 / 60.0a1 / 20180212100154 / files nightly linux64 9a0655ea8ae0 / 60.0a1 / 20180212100154 / files nightly mac 9a0655ea8ae0 / 60.0a1 / 20180212100154 / files nightly win32 9a0655ea8ae0 / 60.0a1 / 20180211220056 / files nightly win64 9a0655ea8ae0 / 60.0a1 / 20180212100154 / files

--- a/testing/talos/talos/tests/devtools/addon/content/damp.html
+++ b/testing/talos/talos/tests/devtools/addon/content/damp.html
@@ -1,16 +1,24 @@
 <html>
   <head>
 <meta charset="UTF-8"/>
 <title>DAMP - Devtools At Maximum Performance</title>
 
 <script type="application/x-javascript">
 // Empty subtests interpreted as all subtests, since otherwise meaningless.
 var config = {subtests: [], repeat: 1};
+
+// Bug 1400580 disable 'complicated.netmonitor' on Win
+ChromeUtils.import("resource://gre/modules/Services.jsm");
+var run_complicated_netmonitor = true;
+if (Services.appinfo.OS == "WINNT") {
+  run_complicated_netmonitor = false;
+}
+
 var defaultConfig = {
   repeat: 1,
   rest: 100,
   subtests: {
     "cold.inspector": true,
 
     "simple.webconsole": true,
     "simple.inspector": true,
@@ -20,17 +28,17 @@ var defaultConfig = {
     "simple.netmonitor": true,
     "simple.saveAndReadHeapSnapshot": true,
 
     "complicated.webconsole": true,
     "complicated.inspector": true,
     "complicated.debugger": true,
     "complicated.styleeditor": true,
     "complicated.performance": true,
-    "complicated.netmonitor": true,
+    "complicated.netmonitor": run_complicated_netmonitor,
     "complicated.saveAndReadHeapSnapshot": true,
 
     "custom.webconsole": true,
     "custom.inspector": true,
     "custom.debugger": true,
 
     "console.bulklog": true,
     "console.streamlog": true,