[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 169 matching lines @@
     ${UP_DOWN_LOAD} DownloadArmBinariesForHWBotsTry ${name} arm-scons.tgz
   else
     ${UP_DOWN_LOAD} DownloadArmBinariesForHWBots ${name} arm-scons.tgz
   fi
 
   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

[Mark Seaborn, 2014/10/10 17:16:37]

Doesn't the Gyp build also invoke pnacl-clang?  If so, the comment isn't
accurate and you can remove it.

[petarj, 2014/10/13 13:02:02]

Done.

+gyp-mips32-build() {

[Mark Seaborn, 2014/10/10 17:16:37]

Nit: can you put this after the ARM version?

[petarj, 2014/10/13 13:02:02]

Done.

+  local gypmode="Release"
+  if [ "${BUILD_MODE_HOST}" = "DEBUG" ] ; then
+      gypmode="Debug"

[Mark Seaborn, 2014/10/10 17:16:36]

Nit: indent by 2, not 4

[petarj, 2014/10/13 13:02:02]

Done. (I made the change in gyp-arm-build() too)

+  fi
+  local toolchain_dir=native_client/toolchain/linux_x86/mips_trusted
+  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
+
+  export AR=mipsel-linux-gnu-ar
+  export AS=mipsel-linux-gnu-as
+  export CC="mipsel-linux-gnu-gcc ${extra} "

[Mark Seaborn, 2014/10/10 17:16:36]

Trailing space not needed?

[petarj, 2014/10/13 13:02:02]

Done. (I made the change in gyp-arm-build() too)

+  export CXX="mipsel-linux-gnu-g++ ${extra} "
+  export LD="mipsel-linux-gnu-g++ ${extra} "
+  export RANLIB=mipsel-linux-gnu-ranlib
+  export SYSROOT

[Mark Seaborn, 2014/10/10 17:16:36]

Not set.  Can this be removed?

[petarj, 2014/10/13 13:02:02]

Done. (I made the change in gyp-arm-build() too)

+  export GYP_DEFINES="target_arch=mipsel mips_arch_variant=mips32r2"
+  export GYP_GENERATORS=make
+  # Ubuntu does not have MIPS trusted toolchain, so specify location of
+  # the one that was built.
+  export PATH=$(pwd)/toolchain/linux_x86/mips_trusted/bin:$PATH

[Mark Seaborn, 2014/10/10 17:16:36]

Shouldn't this just be scoped to the Gyp/make invocations?

Scons has its own way of discovering the MIPS trusted toolchain, so we don't
want Scons to be falling back to this PATH setting, when you add a Scons
invocation later.

Perhaps like this:

local env_var=PATH=$(pwd)/...
...
env $env_var native_client/build/gyp_nacl ...
env $env_var make ...


Or better, can you set:

local bin=$(pwd)/toolchain/linux_x86/mips_trusted/bin
export CC="$bin/mipsel-linux-gnu-gcc ${extra}"
...

so that messing with PATH isn't needed?

[petarj, 2014/10/13 13:02:02]

Done.

+
+  # 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 - 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"
   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 \
@@ skipping 145 matching lines @@
        translate_in_build_step=0" \
     "toolchain_tests"
 
   # Test Non-SFI Mode.
   scons-stage-irt "arm" "${hwflags}" "${SCONS_NONSFI_NEWLIB}"
   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