diff options
author | Guillaume Chatelet <gchatelet@google.com> | 2019-01-18 13:39:25 +0300 |
---|---|---|
committer | Guillaume Chatelet <gchatelet@google.com> | 2019-01-18 13:40:50 +0300 |
commit | faacb00bb8607a18843a26734b3cfbe2ef5a47a8 (patch) | |
tree | 47020e45ff46ff39055f830233e8348859946f0e | |
parent | a528c7f320576a8ea967ab138c69bd14c189d119 (diff) |
Update scripts
-rwxr-xr-x | scripts/run_integration.sh | 7 | ||||
-rwxr-xr-x | scripts/test_integration.sh | 11 |
2 files changed, 7 insertions, 11 deletions
diff --git a/scripts/run_integration.sh b/scripts/run_integration.sh index 2f46bb1..aeb344e 100755 --- a/scripts/run_integration.sh +++ b/scripts/run_integration.sh @@ -140,23 +140,20 @@ function expand_linaro_config() { function expand_codescape_config() { assert_defined TARGET - local FLAVOUR=${QEMU_ARCH}-r2-hard local DATE=2017.10-08 local CODESCAPE_URL=https://codescape.mips.com/components/toolchain/${DATE}/Codescape.GNU.Tools.Package.${DATE}.for.MIPS.MTI.Linux.CentOS-5.x86_64.tar.gz local GCC_URL=${CODESCAPE_URL} local GCC_RELATIVE_FOLDER=${TARGET}/${DATE} unpackifnotexists "${GCC_URL}" "${GCC_RELATIVE_FOLDER}" - local SYSROOT_URL=${CODESCAPE_URL} - local SYSROOT_FOLDER=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER}/sysroot/${FLAVOUR} - unpackifnotexists "${SYSROOT_URL}" "${SYSROOT_RELATIVE_FOLDER}" - CMAKE_ADDITIONAL_ARGS+=" -DENABLE_MSA=1" CMAKE_ADDITIONAL_ARGS+=" -DMIPS_CPU=p5600" CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_TOOLCHAIN_FILE=cmake/mips32-linux-gcc.cmake" CMAKE_ADDITIONAL_ARGS+=" -DCROSS=${TARGET}-" CMAKE_ADDITIONAL_ARGS+=" -DCMAKE_FIND_ROOT_PATH=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER}" + local FLAVOUR=${QEMU_ARCH}-r2-hard + local SYSROOT_FOLDER=${ARCHIVE_FOLDER}/${GCC_RELATIVE_FOLDER}/sysroot/${FLAVOUR} QEMU_ARGS+=" -L ${SYSROOT_FOLDER}" QEMU_ARGS+=" -E LD_LIBRARY_PATH=/lib" QEMU_ARGS+=" -cpu P5600" diff --git a/scripts/test_integration.sh b/scripts/test_integration.sh index 0739dd3..d7d5943 100755 --- a/scripts/test_integration.sh +++ b/scripts/test_integration.sh @@ -34,28 +34,27 @@ function set_arm-linux-gnueabi() { function set_aarch64_be-linux-gnu() { TOOLCHAIN=LINARO TARGET=aarch64_be-linux-gnu - QEMU_ARCH="DISABLED" + QEMU_ARCH=DISABLED } # Toolchains for big-endian, hard-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems function set_armeb-linux-gnueabihf() { TOOLCHAIN=LINARO TARGET=armeb-linux-gnueabihf - QEMU_ARCH="DISABLED" + QEMU_ARCH=DISABLED } # Toolchains for big-endian, soft-float, 32-bit ARMv7 (and earlier) for GNU/Linux systems function set_armeb-linux-gnueabi() { TOOLCHAIN=LINARO TARGET=armeb-linux-gnueabi - QEMU_ARCH="DISABLED" + QEMU_ARCH=DISABLED } - function set_mips() { TOOLCHAIN=CODESCAPE TARGET=mips-mti-linux-gnu - QEMU_ARCH="DISABLED" + QEMU_ARCH=DISABLED } function set_native() { @@ -76,7 +75,7 @@ ENVIRONMENTS=" set_mips " -set -v +set -x set -e CMAKE_GENERATOR="Ninja" |