| OLD | NEW |
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 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=test/yajl_test | 5 EXECUTABLES=test/yajl_test |
| 6 EXTRA_CMAKE_ARGS="-DBUILD_SHARED=${NACL_SHARED}" | 6 EXTRA_CMAKE_ARGS="-DBUILD_SHARED=${NACL_SHARED}" |
| 7 | 7 |
| 8 TestStep() { | 8 TestStep() { |
| 9 local script=${BUILD_DIR}/test/yajl_test.sh | 9 local script=${BUILD_DIR}/test/yajl_test.sh |
| 10 if [ ${NACL_ARCH} = "pnacl" ]; then | 10 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") |
| 11 local pexe=test/yajl_test | 11 |
| 12 TranslateAndWriteLauncherScript ${pexe} x86-32 ${pexe}.x86-32.nexe "${script
}" | 12 if [[ ${NACL_ARCH} == pnacl ]]; then |
| 13 # Re-run the tests with the x86-32 and arm translated binaries |
| 14 WriteLauncherScript ${script} yajl_test.x86-32.nexe |
| 13 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") | 15 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") |
| 14 TranslateAndWriteLauncherScript ${pexe} x86-64 ${pexe}.x86-64.nexe "${script
}" | 16 WriteLauncherScript ${script} yajl_test.arm.nexe |
| 15 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") | |
| 16 else | |
| 17 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") | 17 (cd "${SRC_DIR}/test" && ./run_tests.sh "${script}") |
| 18 fi | 18 fi |
| 19 } | 19 } |
| 20 | 20 |
| 21 # Override configure step to force it use CMake. Without | 21 # Override configure step to force it use CMake. Without |
| 22 # this the default configure step will see the ruby ./configure | 22 # this the default configure step will see the ruby ./configure |
| 23 # script at the top level of yajl (which doesn't work) and | 23 # script at the top level of yajl (which doesn't work) and |
| 24 # try to run that. | 24 # try to run that. |
| 25 ConfigureStep() { | 25 ConfigureStep() { |
| 26 ConfigureStep_CMake | 26 ConfigureStep_CMake |
| 27 } | 27 } |
| OLD | NEW |