diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2015-01-30 10:12:42 -0700 |
|---|---|---|
| committer | Rob Savoye <rob.savoye@linaro.org> | 2015-01-30 10:12:42 -0700 |
| commit | 45213eca7a446e283500d2541474ce045691919a (patch) | |
| tree | 304efacfed08f6c5b27c57747be93798be9a7bb3 | |
| parent | a28d01e9871ebe6b0a7a97aebfdb9189b47abc34 (diff) | |
In the absence of schroots, run QEMU testing on localhost using arm-sim board config. When schroots are enabled, use remote machine for QEMU tests to split CPU load between 2 machines.
| -rw-r--r-- | config/linaro.exp | 20 | ||||
| -rwxr-xr-x | lib/make.sh | 5 |
2 files changed, 19 insertions, 6 deletions
diff --git a/config/linaro.exp b/config/linaro.exp index 8996e4b6..d95f7354 100644 --- a/config/linaro.exp +++ b/config/linaro.exp @@ -14,6 +14,7 @@ if {[info exists env(PREFIX_UNDER_TEST)]} { set flags "$env(FLAGS_UNDER_TEST)" } if {[info exists env(SYSROOT_UNDER_TEST)]} { + set sysroot "$env(SYSROOT_UNDER_TEST)" set flags "${flags} --sysroot=$env(SYSROOT_UNDER_TEST)" } @@ -113,13 +114,20 @@ case "$target_triplet" in { } } { "*linux-gnu*" } { - case "$myname" in { - { build-* } { - set target_list [list $machine_prefix-buildqemu] - } - { tcwg-ex40-* } { - set target_list [list $machine_prefix-tcwgex40qemu] + if { [info exists env(SCHROOT_TEST)] && $env(SCHROOT_TEST) == "yes" } { + case "$myname" in { + { build-* } { + set target_list [list $machine_prefix-buildqemu] + } + { tcwg-ex40-* } { + set target_list [list $machine_prefix-tcwgex40qemu] + } } + } else { + global SIM + set target_list { "arm-sim" } + set board_info(arm-sim,sim,options) "-cpu any -R 0 -L $sysroot" + set SIM "setarch x86_64 -R qemu-[lindex [split $target_triplet -] 0]" } } default { diff --git a/lib/make.sh b/lib/make.sh index 31630c16..22590f74 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -726,6 +726,10 @@ make_check() eval "schroot_make_opts=" eval "schroot_boards=" + # Export SCHROOT_TEST so that we can choose correct boards + # in config/linaro.exp + export SCHROOT_TEST="$schroot_test" + local schroot_port if $exec_tests && [ x"$schroot_test" = x"yes" ]; then # Start schroot sessions on target boards that support it @@ -768,6 +772,7 @@ make_check() # Stop schroot sessions stop_schroot_sessions "$schroot_port" ${schroot_boards} + unset SCHROOT_TEST if test x"${tool}" = x"gcc"; then rm -rf ${sysroots}/etc/ld.so.cache |