diff options
Diffstat (limited to 'lib/make.sh')
| -rwxr-xr-x | lib/make.sh | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/lib/make.sh b/lib/make.sh index 95ba9be4..87a73661 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -799,28 +799,27 @@ make_check() ;; esac + # Declare schroot_make_opts. Its value will be set in + # start_schroot_sessions depending on features that target board[s] + # support. 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 - schroot_port="$(print_schroot_port)" local schroot_sysroot case "${target}" in - *"-elf"*) schroot_sysroot="" ;; + *"-elf"*) schroot_sysroot="$(mktemp -d)" ;; *) schroot_sysroot="$(make_target_sysroot)" ;; esac - start_schroot_sessions "${target}" "${schroot_port}" "${schroot_sysroot}" "${builddir}" + start_schroot_sessions "${target}" "${schroot_sysroot}" "${builddir}" + rm -rf "$schroot_sysroot" if test "$?" != "0"; then - stop_schroot_sessions "${schroot_port}" ${schroot_boards} return 1 fi - rm -rf "$schroot_sysroot" fi case ${tool} in @@ -830,7 +829,7 @@ make_check() ;; gdb) # Stop schroot sessions - stop_schroot_sessions "$schroot_port" ${schroot_boards} + stop_schroot_sessions unset SCHROOT_TEST #local dirs="/gdb" #local check_targets="check-gdb" @@ -851,7 +850,7 @@ make_check() done # Stop schroot sessions - stop_schroot_sessions "$schroot_port" ${schroot_boards} + stop_schroot_sessions unset SCHROOT_TEST if test x"${tool}" = x"gcc"; then |