Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2015 The Native Client Authors. All rights reserved. | 1 # Copyright 2015 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 EXECUTABLES="tools/fftwf-wisdom${NACL_EXEEXT} tests/bench${NACL_EXEEXT}" | 5 EXECUTABLES="tools/fftwf-wisdom${NACL_EXEEXT} tests/bench${NACL_EXEEXT}" |
| 6 | 6 |
| 7 EXTRA_CONFIGURE_ARGS="--enable-float" | 7 EXTRA_CONFIGURE_ARGS="--enable-float" |
| 8 | 8 |
| 9 if [ "${NACL_ARCH}" = "arm" ]; then | 9 if [ "${NACL_ARCH}" = "arm" ]; then |
| 10 NACLPORTS_CPPFLAGS+=" -fomit-frame-pointer -fstrict-aliasing \ | 10 NACLPORTS_CPPFLAGS+=" -fomit-frame-pointer -fstrict-aliasing \ |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 24 fi | 24 fi |
| 25 | 25 |
| 26 LogExecute ${SRC_DIR}/configure \ | 26 LogExecute ${SRC_DIR}/configure \ |
| 27 --host=nacl \ | 27 --host=nacl \ |
| 28 --prefix=${PREFIX} \ | 28 --prefix=${PREFIX} \ |
| 29 --enable-threads \ | 29 --enable-threads \ |
| 30 ${EXTRA_CONFIGURE_ARGS:-} | 30 ${EXTRA_CONFIGURE_ARGS:-} |
| 31 } | 31 } |
| 32 | 32 |
| 33 TestStep() { | 33 TestStep() { |
| 34 LogExecute make check EXEEXT= | |
| 35 | |
| 34 if [ ${NACL_ARCH} = "pnacl" ]; then | 36 if [ ${NACL_ARCH} = "pnacl" ]; then |
| 35 for arch in x86-32 x86-64; do | 37 for arch in x86-32 arm; do |
|
binji
2016/01/04 19:37:03
I wonder if there's a clearer way to do this; it t
| |
| 36 for exe in ${EXECUTABLES}; do | 38 for exe in ${EXECUTABLES}; do |
| 37 local exe_noext=${exe%.*} | 39 local exe_noext=${exe%.*} |
| 38 WriteLauncherScriptPNaCl ${exe_noext} \ | 40 WriteLauncherScript ${exe_noext} $(basename ${exe_noext}.${arch}.nexe) |
| 39 $(basename ${exe_noext}.${arch}.nexe) ${arch} | |
| 40 done | 41 done |
| 41 make check EXEEXT= | 42 LogExecute make check EXEEXT= |
| 42 done | 43 done |
| 43 else | |
| 44 make check EXEEXT= | |
| 45 fi | 44 fi |
| 46 } | 45 } |
| OLD | NEW |