Bug 1146520 - Fix some minor autospider issues on OS X. r=sfink
authorJan de Mooij <jdemooij@mozilla.com>
Wed, 25 Mar 2015 15:15:25 +0100
changeset 266040 f58f1d2a1766af712f5d3101d62265bf267cb161
parent 266039 9bf8f0e455c481aecfab9c6f85a5720d9b0c577a
child 266041 584132a9787200d20c4c7f492d8ec580f7c60217
push id830
push userraliiev@mozilla.com
push dateFri, 19 Jun 2015 19:24:37 +0000
treeherdermozilla-release@932614382a68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssfink
bugs1146520
milestone39.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 1146520 - Fix some minor autospider issues on OS X. r=sfink
js/src/devtools/automation/autospider.sh
js/src/devtools/automation/variants/arm-sim
js/src/devtools/automation/variants/arm-sim-osx
--- a/js/src/devtools/automation/autospider.sh
+++ b/js/src/devtools/automation/autospider.sh
@@ -40,17 +40,17 @@ if [[ "$VARIANT" = "generational" ]]; th
 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)
+(cd "$SOURCE/js/src"; autoconf-2.13 || autoconf2.13 || autoconf213)
 
 TRY_OVERRIDE=$SOURCE/js/src/config.try
 if [ -r $TRY_OVERRIDE ]; then
   CONFIGURE_ARGS="$(cat "$TRY_OVERRIDE")"
 else
   CONFIGURE_ARGS="$(cat "$ABSDIR/variants/$VARIANT")"
 fi
 
@@ -65,16 +65,19 @@ fi
 cd "$OBJDIR"
 
 echo "OBJDIR is $OBJDIR"
 
 USE_64BIT=false
 
 if [[ "$OSTYPE" == darwin* ]]; then
   USE_64BIT=true
+  if [ "$VARIANT" = "arm-sim-osx" ]; then
+    USE_64BIT=false
+  fi
 elif [ "$OSTYPE" = "linux-gnu" ]; then
   if [ -n "$AUTOMATION" ]; then
       GCCDIR="${GCCDIR:-/tools/gcc-4.7.2-0moz1}"
       CONFIGURE_ARGS="$CONFIGURE_ARGS --with-ccache"
   fi
   UNAME_M=$(uname -m)
   MAKEFLAGS=-j4
   if [ "$VARIANT" = "arm-sim" ]; then
--- a/js/src/devtools/automation/variants/arm-sim
+++ b/js/src/devtools/automation/variants/arm-sim
@@ -1,8 +1,7 @@
 --enable-optimize
 --enable-debug
 --enable-stdcxx-compat
 --disable-shared-js
---enable-threadsafe
 --enable-arm-simulator
 --target=i686-pc-linux
 --host=i686-pc-linux
new file mode 100644
--- /dev/null
+++ b/js/src/devtools/automation/variants/arm-sim-osx
@@ -0,0 +1,6 @@
+--enable-optimize
+--enable-debug
+--enable-stdcxx-compat
+--disable-shared-js
+--enable-arm-simulator
+--target=i686-apple-darwin10.0.0