From 8761fd1f41754324b9e36c3399a44994e89a84d3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 1 Jan 2016 19:44:58 +0100 Subject: fix some varable scope issues --- embedded-test.sh | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/embedded-test.sh b/embedded-test.sh index 8a7ac59..cdc3f23 100755 --- a/embedded-test.sh +++ b/embedded-test.sh @@ -91,7 +91,6 @@ cleandir=0 shell=0 update=0 debug=0 -piggyback=0 ntp="" libc="" test="toolchain" @@ -152,22 +151,17 @@ else fi fi -cpu_arch= -march= -qemu= -qemu_machine= -qemu_args= -suffix= -dtbdir= -emulator= -piggyback= -allowed_libc= -runtime_test= - get_arch_info() { arch=$1 lib=$2 + emulator=qemu + noappend=0 + piggyback=0 + allowed_libc= + runtime_test= + qemu_args=-nographic + case ${arch} in aarch64) allowed_libc="musl glibc" @@ -754,21 +748,15 @@ runtest() { arch=$2 test=$3 - emulator=qemu - qemu=qemu-system-${arch} - qemu_args=-nographic if [ $ntp ]; then qemu_append="-append ntpserver=$ntp" fi if [ $shell -eq 1 ]; then qemu_append="-append shell" fi - noappend=0 - piggyback=0 - suffix= - libdir=lib - march=${arch} + qemu=qemu-system-${arch} + march=${arch} get_arch_info $arch $lib case $emulator in -- cgit v1.2.3