Improve emscripten download, install and auto-detection

build_tools/buildbot_selector.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.
 
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Main entry point for buildbots.
 # For local testing set BUILDBOT_BUILDERNAME and TEST_BUILDBOT, e.g:
@@ skipping 160 matching lines @@
   echo ${PYTHON} ${SCRIPT_DIR}/download_emscripten.py
   ${PYTHON} ${SCRIPT_DIR}/download_emscripten.py
 
   # Mechanism by which emscripten patches can be tested on the trybots
   if [ -f "${NACLPORTS_SRC}/emscripten.patch" ]; then
     cd ${EMSCRIPTEN_ROOT}
     echo "Applying emscripten.patch"
     git apply "${NACLPORTS_SRC}/emscripten.patch"
     cd -
   fi
-
-  # Add the node 'bin' directory to the PATH.
-  # TODO(sbc): probably cleaner to modify .emscripten file instead.
-  local node_bin=${NACLPORTS_SRC}/out/node-v0.12.1-linux-x64/bin/
-  if [ ! -d "${node_bin}" ]; then
-    echo "node bin directory not found: ${node_bin}"
-    exit 1
-  fi
-  echo "Adding node bin directory to PATH: ${node_bin}"
-  export PATH=${PATH}:${node_bin}
-
-  export EM_CONFIG=${EMSDK_ROOT}/.emscripten
-  export EMSCRIPTEN=${EMSDK_ROOT}/emscripten
-  echo "Setting EM_CONFIG: ${EM_CONFIG} EMSCRIPTEN: ${EMSCRIPTEN}"
-
-  echo "Adding emscripten to PATH: ${EMSCRIPTEN_ROOT}"
-  export PATH=${PATH}:${EMSCRIPTEN_ROOT}
-
-  # Finally, run 'emcc -v' which will check that the compiler is working
-  echo "Running emcc -v"
-  emcc -v
-
-  # Run using -O2 to compile the native js-optimizer
-  touch ${NACLPORTS_SRC}/out/test.c
-  emcc -O2 -o ${NACLPORTS_SRC}/out/test.js ${NACLPORTS_SRC}/out/test.c
-  rm ${NACLPORTS_SRC}/out/test.{c,js}
 }
 
 Unittests() {
   echo "@@@BUILD_STEP naclports unittests@@@"
   CMD="make -C $(dirname ${SCRIPT_DIR}) check"
   echo "Running ${CMD}"
   if ! ${CMD}; then
     RESULT=1
     echo "@@@STEP_FAILURE@@@"
   fi
@@ skipping 42 matching lines @@
   Publish
 fi
 
 echo "@@@BUILD_STEP Summary@@@"
 if [ "${RESULT}" != "0" ] ; then
   echo "@@@STEP_FAILURE@@@"
   echo -e "${MESSAGES}"
 fi
 
 exit ${RESULT}