[MIPS] Enhance MIPS testing on its buildbot

buildbot/buildbot_pnacl.sh

 #!/bin/bash
 # Copyright (c) 2012 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 set -o xtrace
 set -o nounset
 set -o errexit
 
 # Tell build.sh and test.sh that we're a bot.
@@ skipping 180 matching lines @@
   echo "@@@BUILD_STEP untar_binaries@@@"
   rm -rf scons-out/
   tar xvfz arm-scons.tgz --no-same-owner
 }
 
 # Build with gyp - this only exercises the trusted TC and hence this only
 # makes sense to run for ARM.
 gyp-arm-build() {
   local gypmode="Release"
   if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
-      gypmode="Debug"
+    gypmode="Debug"
   fi
   local toolchain_dir=native_client/toolchain/linux_x86/arm_trusted
   local extra="-isystem ${toolchain_dir}/usr/include \
                -Wl,-rpath-link=${toolchain_dir}/lib/arm-linux-gnueabihf \
                -L${toolchain_dir}/lib \
                -L${toolchain_dir}/lib/arm-linux-gnueabihf \
                -L${toolchain_dir}/usr/lib \
                -L${toolchain_dir}/usr/lib/arm-linux-gnueabihf"
   # Setup environment for arm.
 
   export AR=arm-linux-gnueabihf-ar
   export AS=arm-linux-gnueabihf-as
-  export CC="arm-linux-gnueabihf-gcc ${extra} "
-  export CXX="arm-linux-gnueabihf-g++ ${extra} "
-  export LD="arm-linux-gnueabihf-g++ ${extra} "
+  export CC="arm-linux-gnueabihf-gcc ${extra}"
+  export CXX="arm-linux-gnueabihf-g++ ${extra}"
+  export LD="arm-linux-gnueabihf-g++ ${extra}"
   export RANLIB=arm-linux-gnueabihf-ranlib
-  export SYSROOT
   export GYP_DEFINES="target_arch=arm \
     sysroot=${toolchain_dir} \
     linux_use_tcmalloc=0 armv7=1 arm_thumb=1"
   export GYP_GENERATORS=make
 
   # NOTE: this step is also run implicitly as part of
   #        gclient runhooks --force
   #       it uses the exported env vars so we have to run it again
   #
   echo "@@@BUILD_STEP gyp_configure [${gypmode}]@@@"
   cd ..
   native_client/build/gyp_nacl native_client/build/all.gyp
   cd native_client
 
   echo "@@@BUILD_STEP gyp_compile [${gypmode}]@@@"
   make -C .. -k -j8 V=1 BUILDTYPE=${gypmode}
 }
 
+# Build with gyp for MIPS.
+gyp-mips32-build() {
+  local gypmode="Release"
+  if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
+    gypmode="Debug"
+  fi
+  local toolchain_dir=native_client/toolchain/linux_x86/mips_trusted

[Mark Seaborn, 2014/10/13 15:34:44]

Maybe use "$(pwd)/toolchain..."?  See other comment.

[petarj, 2014/10/13 19:05:10]

Done.

+  local extra="-EL -isystem ${toolchain_dir}/usr/include \
+               -Wl,-rpath-link=${toolchain_dir}/lib/mipsel-linux-gnu \
+               -L${toolchain_dir}/lib \
+               -L${toolchain_dir}/lib/mipsel-linux-gnu \
+               -L${toolchain_dir}/usr/lib \
+               -L${toolchain_dir}/usr/lib/mipsel-linux-gnu"
+  # Setup environment for mips32.
+
+  # Check if MIPS TC has already been built. If not, build it.
+  if [ ! -f ${toolchain_dir}/bin/mipsel-linux-gnu-gcc ]
+    then tools/trusted_cross_toolchains/trusted-toolchain-creator.mipsel.debian.sh nacl_sdk
+  fi
+
+  local bin=$(pwd)/toolchain/linux_x86/mips_trusted/bin

[Mark Seaborn, 2014/10/13 15:34:44]

You could reuse $toolchain_dir from above.  (Although these two differ in
whether they're relative and include "native_client" in the path.)

[petarj, 2014/10/13 19:05:10]

Done.

+
+  export AR="$bin/mipsel-linux-gnu-ar"
+  export AS="$bin/mipsel-linux-gnu-as"
+  export CC="$bin/mipsel-linux-gnu-gcc ${extra}"
+  export CXX="$bin/mipsel-linux-gnu-g++ ${extra}"
+  export LD="$bin/mipsel-linux-gnu-g++ ${extra}"
+  export RANLIB="$bin/mipsel-linux-gnu-ranlib"
+  export GYP_DEFINES="target_arch=mipsel mips_arch_variant=mips32r2"
+  export GYP_GENERATORS=make
+
+  # NOTE: this step is also run implicitly as part of
+  #        gclient runhooks --force
+  #       it uses the exported env vars so we have to run it again
+  #
+  echo "@@@BUILD_STEP gyp_configure [${gypmode}]@@@"
+  cd ..
+  native_client/build/gyp_nacl native_client/build/all.gyp
+  cd native_client
+
+  echo "@@@BUILD_STEP gyp_compile [${gypmode}]@@@"
+  make -C .. -k -j8 V=1 BUILDTYPE=${gypmode}
+}
+
 build-sbtc-prerequisites() {
   local platform=$1
   # Sandboxed translators currently only require irt_core since they do not
   # use PPAPI.
   ${SCONS_COMMON} platform=${platform} sel_ldr sel_universal irt_core
 }
 
 # Run a single invocation of scons as its own buildbot stage and handle errors
 scons-stage-irt() {
   local platform=$1
@@ skipping 108 matching lines @@
 
   # Test Non-SFI Mode.
   scons-stage-irt "arm" "${hwflags}" "${SCONS_NONSFI_NEWLIB}"
   scons-stage-irt "arm" "${hwflags}" \
     "${SCONS_NONSFI_NEWLIB_NOPNACL_GENERATE_PEXE}"
   scons-stage-irt "arm" "${hwflags}" "${SCONS_NONSFI}"
 }
 
 mode-trybot-qemu() {
   clobber
+  local arch=$1
   # TODO(dschuff): move the gyp build to buildbot_pnacl.py
-  gyp-arm-build
+  if [[ ${arch} == "arm" ]] ; then
+    gyp-arm-build
+  elif [[ ${arch} == "mips32" ]] ; then
+    gyp-mips32-build
+  fi
 
-  buildbot/buildbot_pnacl.py opt arm pnacl
+  # TODO(petarj): Enable this for MIPS arch too once all the tests pass.
+  if [[ ${arch} == "arm" ]] ; then
+    buildbot/buildbot_pnacl.py opt $arch pnacl
+  fi
 }
 
 mode-buildbot-arm-dbg() {
   BUILD_MODE_HOST=DEDUG
   mode-buildbot-arm
   archive-for-hw-bots $(NAME_ARM_UPLOAD) regular
 }
 
 mode-buildbot-arm-opt() {
   mode-buildbot-arm
@@ skipping 119 matching lines @@
   exit 1
 fi
 
 "$@"
 
 if [[ ${RETCODE} != 0 ]]; then
   echo "@@@BUILD_STEP summary@@@"
   echo There were failed stages.
   exit ${RETCODE}
 fi