summaryrefslogtreecommitdiffstats
path: root/js/src/devtools
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
committerMatt A. Tobin <email@mattatobin.com>2018-02-03 15:50:22 -0500
commit0083d404eff36f873cde465d50cd34b112bd124f (patch)
tree465b1f4322c3a2439903d9cabb068169bf6b42c9 /js/src/devtools
parentc6856f968b8c85502f14c6c3412b00a05fc0c0de (diff)
parent10494e1b7d0b3cd945bb76dca10f5637cf786f27 (diff)
downloadUXP-0083d404eff36f873cde465d50cd34b112bd124f.tar
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.gz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.lz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.tar.xz
UXP-0083d404eff36f873cde465d50cd34b112bd124f.zip
Merge branch 'master' into configurebuild-work
Diffstat (limited to 'js/src/devtools')
-rw-r--r--js/src/devtools/automation/variants/compacting1
-rw-r--r--js/src/devtools/automation/variants/rootanalysis1
2 files changed, 0 insertions, 2 deletions
diff --git a/js/src/devtools/automation/variants/compacting b/js/src/devtools/automation/variants/compacting
index cd1891bfe..2ffade6ac 100644
--- a/js/src/devtools/automation/variants/compacting
+++ b/js/src/devtools/automation/variants/compacting
@@ -3,7 +3,6 @@
"optimize": true,
"debug": true,
"env": {
- "JS_GC_ZEAL": "Compact",
"JITTEST_EXTRA_ARGS": "--jitflags=debug --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt",
"JSTESTS_EXTRA_ARGS": "--exclude-file={DIR}/cgc-jstests-slow.txt"
},
diff --git a/js/src/devtools/automation/variants/rootanalysis b/js/src/devtools/automation/variants/rootanalysis
index c5ed4dfcd..508e1e2db 100644
--- a/js/src/devtools/automation/variants/rootanalysis
+++ b/js/src/devtools/automation/variants/rootanalysis
@@ -3,7 +3,6 @@
"optimize": true,
"debug": true,
"env": {
- "JS_GC_ZEAL": "GenerationalGC",
"JSTESTS_EXTRA_ARGS": "--jitflags=debug"
}
}