Bug 1136309 - Rename the spidermonkey build variants. r=terrence, a=test-only
authorSteve Fink <sfink@mozilla.com>
Tue, 24 Feb 2015 11:27:45 -0800
changeset 260305 604326355be0
parent 260304 f7170ad49667
child 260306 517741a918b0
push id743
push userryanvm@gmail.com
push date2015-04-28 15:04 +0000
treeherdermozilla-release@16c98999de0b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence, test-only
bugs1136309
milestone38.0
Bug 1136309 - Rename the spidermonkey build variants. r=terrence, a=test-only
js/src/devtools/automation/arm-sim
js/src/devtools/automation/autospider.sh
js/src/devtools/automation/dtrace
js/src/devtools/automation/exactrooting
js/src/devtools/automation/generational
js/src/devtools/automation/nomethodjit
js/src/devtools/automation/rootanalysis
js/src/devtools/automation/vanilla
js/src/devtools/automation/variants/arm-sim
js/src/devtools/automation/variants/compacting
js/src/devtools/automation/variants/dtrace
js/src/devtools/automation/variants/exactrooting
js/src/devtools/automation/variants/generational
js/src/devtools/automation/variants/nomethodjit
js/src/devtools/automation/variants/plain
js/src/devtools/automation/variants/plaindebug
js/src/devtools/automation/variants/rootanalysis
js/src/devtools/automation/variants/warnaserr
js/src/devtools/automation/variants/warnaserrdebug
js/src/devtools/automation/warnaserr
js/src/devtools/automation/warnaserrdebug
--- a/js/src/devtools/automation/autospider.sh
+++ b/js/src/devtools/automation/autospider.sh
@@ -27,29 +27,36 @@ while [ $# -gt 1 ]; do
             echo "Invalid arguments" >&2
             usage
             exit 1
             ;;
     esac
 done
 
 VARIANT=$1
-if [ ! -f "$ABSDIR/$VARIANT" ]; then
+
+# 'generational' is being retired in favor of 'compacting', but we need to
+# decouple the landings.
+if [[ "$VARIANT" = "generational" ]]; then
+    VARIANT=compacting
+fi
+
+if [ ! -f "$ABSDIR/variants/$VARIANT" ]; then
     echo "Could not find variant '$VARIANT'"
     usage
     exit 1
 fi
 
 (cd "$SOURCE/js/src"; autoconf-2.13 || autoconf2.13)
 
 TRY_OVERRIDE=$SOURCE/js/src/config.try
 if [ -r $TRY_OVERRIDE ]; then
   CONFIGURE_ARGS="$(cat "$TRY_OVERRIDE")"
 else
-  CONFIGURE_ARGS="$(cat "$ABSDIR/$VARIANT")"
+  CONFIGURE_ARGS="$(cat "$ABSDIR/variants/$VARIANT")"
 fi
 
 OBJDIR="${OBJDIR:-$SOURCE/obj-spider}"
 
 if [ -n "$clean" ]; then
   [ -d "$OBJDIR" ] && rm -rf "$OBJDIR"
   mkdir "$OBJDIR"
 else
@@ -118,18 +125,17 @@ if type setarch >/dev/null 2>&1; then
     COMMAND_PREFIX="setarch $(uname -m) -R "
 fi
 
 RUN_JSTESTS=true
 
 if [[ "$VARIANT" = "rootanalysis" ]]; then
     export JS_GC_ZEAL=7
 
-elif [[ "$VARIANT" = "generational" ]]; then
-    # Generational is currently being used for compacting GC
+elif [[ "$VARIANT" = "compacting" ]]; then
     export JS_GC_ZEAL=14
 
     # Ignore timeouts from tests that are known to take too long with this zeal mode
     export JITTEST_EXTRA_ARGS=--ignore-timeouts=$ABSDIR/cgc-jittest-timeouts.txt
     export JSTESTS_EXTRA_ARGS=--exclude-file=$ABSDIR/cgc-jstests-slow.txt
 
     case "$platform" in
     win*)
deleted file mode 100644
--- a/js/src/devtools/automation/vanilla
+++ /dev/null
@@ -1,2 +0,0 @@
---enable-optimize
---enable-debug
rename from js/src/devtools/automation/arm-sim
rename to js/src/devtools/automation/variants/arm-sim
new file mode 100644
--- /dev/null
+++ b/js/src/devtools/automation/variants/compacting
@@ -0,0 +1,5 @@
+--enable-optimize
+--enable-debug
+--enable-stdcxx-compat
+--enable-ctypes
+--disable-shared-js
rename from js/src/devtools/automation/dtrace
rename to js/src/devtools/automation/variants/dtrace
rename from js/src/devtools/automation/exactrooting
rename to js/src/devtools/automation/variants/exactrooting
rename from js/src/devtools/automation/generational
rename to js/src/devtools/automation/variants/generational
rename from js/src/devtools/automation/nomethodjit
rename to js/src/devtools/automation/variants/nomethodjit
new file mode 100644
--- /dev/null
+++ b/js/src/devtools/automation/variants/plain
@@ -0,0 +1,1 @@
+--enable-optimize
new file mode 100644
--- /dev/null
+++ b/js/src/devtools/automation/variants/plaindebug
@@ -0,0 +1,1 @@
+--enable-debug
rename from js/src/devtools/automation/rootanalysis
rename to js/src/devtools/automation/variants/rootanalysis
rename from js/src/devtools/automation/warnaserr
rename to js/src/devtools/automation/variants/warnaserr
rename from js/src/devtools/automation/warnaserrdebug
rename to js/src/devtools/automation/variants/warnaserrdebug