Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / native_client / pnacl / test.sh

diff --git a/src/native_client/pnacl/test.sh b/src/native_client/pnacl/test.sh
index ab5462a..a112049 100755 (executable)
--- a/src/native_client/pnacl/test.sh
+++ b/src/native_client/pnacl/test.sh
@@ -43,10 +43,6 @@ readonly NACL_ROOT="$(pwd)"
 
 readonly DRYRUN=${DRYRUN:-false}
 
-# This is only used by Spec2K test scripts.
-readonly PNACL_LIBMODE=newlib
-export PNACL_LIBMODE
-
 source pnacl/scripts/common-tools.sh
 SetScriptPath "${NACL_ROOT}/pnacl/test.sh"
 SetLogDirectory "${NACL_ROOT}/toolchain/test-log"
@@ -54,9 +50,6 @@ SetLogDirectory "${NACL_ROOT}/toolchain/test-log"
 # For different levels of make parallelism change this in your env
 readonly PNACL_CONCURRENCY=${PNACL_CONCURRENCY:-8}
 
-readonly OTHER_TEST_SCRIPT="${NACL_ROOT}/buildbot/buildbot_pnacl.sh"
-readonly LLVM_TEST="${NACL_ROOT}/pnacl/scripts/llvm-test.py"
-
 # This needs to be kept in sync with the var of the same name in build.sh
 readonly TC_BUILD_LLVM="$(pwd)/pnacl/build/llvm_${HOST_ARCH}"
 
@@ -182,18 +175,6 @@ test-x86-32-sbtc() { scons-tests x86-32 sbtc "$@" ; }
 test-x86-64-sbtc() { scons-tests x86-64 sbtc "$@" ; }
 
 #@
-#@ test-all  - Run arm, x86-32, and x86-64 tests. (all should pass)
-test-all() {
-  if [ $# -ne 0 ]; then
-    echo "test-all does not take any arguments"
-    exit -1
-  fi
-
-  ${LLVM_TEST} --llvm-regression --check-excludes
-  FAIL_FAST=true ${OTHER_TEST_SCRIPT} mode-test-all ${PNACL_CONCURRENCY}
-}
-
-#@
 #@ test-spec <official-spec-dir> <setup> [ref|train] [<benchmarks>]*
 #@                       - run spec tests
 test-spec() {
@@ -249,6 +230,7 @@ CollectTimingInfo() {
 timed-test-spec() {
   if ${BUILD_PLATFORM_MAC} ; then
     echo "Timed-test-spec is not currently supported on MacOS"
+    echo "Namely, /usr/bin/time -f is not supported."
     exit -1
   fi
   if [ "$#" -lt "3" ]; then