Bug 1136309 - Rename the spidermonkey build variants. r=terrence, a=test-only

js/src/devtools/automation/autospider.sh

@@ -32,7 +32,14 @@ while [ $# -gt 1 ]; do
 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
@@ -44,7 +51,7 @@ 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}"
@@ -123,8 +130,7 @@ RUN_JSTESTS=true
 if [[ "$VARIANT" = "rootanalysis" ]]; then
     export JS_GC_ZEAL=7
 
-elif [[ "$VARIANT" = "generational" ]]; then
+elif [[ "$VARIANT" = "compacting" ]]; then
-    # Generational is currently being used for compacting GC
     export JS_GC_ZEAL=14
 
     # Ignore timeouts from tests that are known to take too long with this zeal mode

js/src/devtools/automation/variants/compacting

@@ -0,0 +1,5 @@
+--enable-optimize
+--enable-debug
+--enable-stdcxx-compat
+--enable-ctypes
+--disable-shared-js

js/src/devtools/automation/variants/plain

@@ -1,2 +1 @@
 --enable-optimize
---enable-debug

js/src/devtools/automation/variants/plaindebug

@@ -0,0 +1 @@
+--enable-debug