rework architecture variables

Use two spaces instead of tabs. Use one case statement
to declare all required variables for an architecture.
Simpler to recognize any missing or wrong architectures.

Everything is now a test and only one test each run
is allowed. The default is toolchain now. This avoids
unneeded rebuilds of openadk.

There is one open issue, rebuild of uClibc-ng is not detected,
this will be fixed soon, so that testsuite gets installed properly.

1 files changed, 776 insertions, 799 deletions

diff --git a/embedded-test.sh b/embedded-test.sh
index 60a3697..fd1efa7 100755
--- a/embedded-test.sh
+++ b/embedded-test.sh
@@ -23,7 +23,7 @@
 # ware Foundation.
 
 # uClibc-ng
-arch_list_uclibcng="armv5 armv7 armeb arcv1 arcv2 arcv1-be arcv2-be avr32 bfin c6x crisv10 crisv32 m68k m68k-nommu metag microblazeel microblazebe mips mipssf mipsel mipselsf mips64 mips64eln32 mips64n32 mips64n64 mips64el mips64el mips64eln64 or1k ppc ppcsf sh2 sh3 sh4 sh4eb sparc x86 x86_64 xtensa"
+arch_list_uclibcng="armv5 armv7 armeb arcv1 arcv2 arcv1-be arcv2-be avr32 bfin c6x crisv10 crisv32 m68k m68k-nommu metag microblazeel microblazebe mips mipssf mipsel mipselsf mips64 mips64eln32 mips64n32 mips64n64 mips64el mips64el mips64eln64 or1k ppc ppcsf sh3 sh4 sh4eb sparc x86 x86_64 xtensa"
 
 # musl
 arch_list_musl="aarch64 armv5 armv7 armeb microblazeel microblazebe mips mipssf mipsel mipselsf or1k ppc sh4 sh4eb x86 x86_64"
@@ -37,27 +37,27 @@ arch_list_newlib="armv5 armeb bfin crisv10 crisv32 frv lm32 m68k microblazeel mi
 topdir=$(pwd)
 giturl=http://git.openadk.org/openadk.git
 valid_libc="uclibc-ng musl glibc newlib"
-valid_tests="boot libc ltp mksh native"
+valid_tests="toolchain boot libc ltp mksh native"
 
 tools='make git wget xz cpio tar awk sed'
 f=0
 for tool in $tools; do
-	if ! which $tool >/dev/null; then
-		echo "Checking if $tool is installed... failed"
-		f=1
-	fi
+  if ! which $tool >/dev/null; then
+    echo "Checking if $tool is installed... failed"
+    f=1
+  fi
 done
 if [ $f -eq 1 ];then exit 1; fi
 
 help() {
 	cat >&2 <<EOF
-Syntax: $0 [ --libc=<libc> --arch=<arch> --tests=<tests> ]
+Syntax: $0 [ --libc=<libc> --arch=<arch> --test=<test> ]
 
 Explanation:
 	--libc=<libc>             c library to use (${valid_libc})
 	--arch=<arch>             architecture to check (otherwise all supported)
 	--skiparch=<arch>         architectures to skip when all choosen
-	--tests=<tests>           run tests (${valid_tests})
+	--test=<test>             run test (${valid_tests}), default toolchain
 	--source=<dir>            use directory with source for C library
 	--ntp=<ntpserver>         set NTP server for test run
 	--packages=<packagelist>  add extra packages to the build
@@ -66,7 +66,7 @@ Explanation:
 	--cleandir                clean OpenADK build directories before build
 	--clean                   clean OpenADK build directory for single arch
 	--debug                   enable debug output from OpenADK
-	--shell                   start a shell instead auf autorun of test
+	--shell                   start a shell instead of test autorun
 	--help                    this help text
 EOF
 	exit 1
@@ -81,6 +81,7 @@ debug=0
 piggyback=0
 ntp=""
 libc=""
+test="toolchain"
 
 while [[ $1 != -- && $1 = -* ]]; do case $1 { 
   (--cleandir) cleandir=1; shift ;;
@@ -92,7 +93,7 @@ while [[ $1 != -- && $1 = -* ]]; do case $1 {
   (--libc=*) libc=${1#*=}; shift ;;
   (--arch=*) archs=${1#*=}; shift ;;
   (--skiparch=*) skiparchs=${1#*=}; shift ;;
-  (--tests=*) tests=${1#*=}; shift ;;
+  (--test=*) test=${1#*=}; shift ;;
   (--source=*) source=${1#*=}; shift ;;
   (--packages=*) packages=${1#*=}; shift ;;
   (--ntp=*) ntp=${1#*=}; shift ;;
@@ -101,843 +102,819 @@ while [[ $1 != -- && $1 = -* ]]; do case $1 {
   (-*) help ;;
 }; done
 
-if [ -z "$libc" ];then
-	libc="uclibc-ng musl glibc newlib"
+if [ -z "$libc" ]; then
+  libc="uclibc-ng musl glibc newlib"
 fi
 
-if [ ! -d openadk ];then
-	git clone $giturl
-	if [ $? -ne 0 ];then
-		echo "Cloning from $giturl failed."
-		exit 1
-	fi
+if [ ! -d openadk ]; then
+  git clone $giturl
+  if [ $? -ne 0 ]; then
+    echo "Cloning from $giturl failed."
+    exit 1
+  fi
 else
-	if [ $update -eq 1 ];then
-		(cd openadk && git pull)
-		if [ $? -ne 0 ];then
-			echo "Updating from $giturl failed."
-			exit 1
-		fi
-	fi
+  if [ $update -eq 1 ]; then
+    (cd openadk && git pull)
+    if [ $? -ne 0 ]; then
+      echo "Updating from $giturl failed."
+      exit 1
+    fi
+  fi
 fi
 
-runtest() {
+cpu_arch=
+march=
+qemu=
+qemu_machine=
+qemu_args=
+suffix=
+dtbdir=
+emulator=
+piggyback=
+allowed_libc=
+runtime_test=
+
+get_arch_info() {
+  arch=$1
+  lib=$2
+
+  case ${arch} in
+    aarch64)
+      allowed_libc="musl glibc"
+      runtime_test="musl glibc"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=aarch64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-aarch64"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=aarch64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-aarch64"
+      cpu_arch=aarch64
+      qemu_machine=virt
+      qemu_args="${qemu_args} -cpu cortex-a57 -netdev user,id=eth0 -device virtio-net-device,netdev=eth0"
+      ;;
+    armv5)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-versatilepb"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-versatilepb"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-versatilepb"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=arm ADK_TARGET_ENDIAN=little ADK_TARGET_SYSTEM=toolchain-arm ADK_TARGET_CPU=arm926ej-s"
+      cpu_arch=arm
+      march=arm-versatilepb
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=versatilepb
+      suffix=soft_eabi
+      dtbdir=openadk/firmware/qemu-${march}_${lib}_${cpu_arch}_${suffix}
+      qemu_args="${qemu_args} -cpu arm926 -net user -net nic,model=smc91c111"
+      ;;
+    armv7)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-vexpress-a9"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-vexpress-a9"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-vexpress-a9"
+      cpu_arch=arm
+      march=arm-vexpress-a9
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=vexpress-a9
+      suffix=hard_eabihf
+      dtbdir=openadk/firmware/qemu-${march}_${lib}_${cpu_arch}_${suffix}
+      qemu_args="${qemu_args} -cpu cortex-a9 -net user -net nic,model=lan9118 -dtb ${dtbdir}/vexpress-v2p-ca9.dtb"
+      ;;
+    armeb)
+      allowed_libc="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-arm ADK_TARGET_FLOAT=soft ADK_TARGET_ENDIAN=big"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-arm ADK_TARGET_FLOAT=soft ADK_TARGET_ENDIAN=big"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-arm ADK_TARGET_FLOAT=soft ADK_TARGET_ENDIAN=big"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=arm ADK_TARGET_ENDIAN=big ADK_TARGET_SYSTEM=toolchain-arm"
+      ;;
+    arcv1)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv1 ADK_TARGET_ENDIAN=little"
+      emulator=nsim
+      cpu_arch=arc
+      piggyback=1
+      ;;
+    arcv2)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv2 ADK_TARGET_ENDIAN=little"
+      emulator=nsim
+      cpu_arch=arc
+      piggyback=1
+      ;;
+    arcv1-be)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv1 ADK_TARGET_ENDIAN=big"
+      emulator=nsim
+      cpu_arch=arceb
+      march=arcv1
+      piggyback=1
+      ;;
+    arcv2-be)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv2 ADK_TARGET_ENDIAN=big"
+      emulator=nsim
+      cpu_arch=arceb
+      march=arcv2
+      piggyback=1
+      ;;
+    avr32)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=avr32 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-avr32"
+      ;;
+    bfin)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=bfin ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-bfin"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=bfin ADK_TARGET_SYSTEM=toolchain-bfin"
+      ;;
+    c6x)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=c6x ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-c6x"
+      ;;
+    crisv10)
+      allowed_libc="uclibc-ng newlib"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=cris ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-cris ADK_TARGET_CPU=crisv10"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=cris ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-cris ADK_TARGET_CPU=crisv10"
+      ;;
+    crisv32)
+      allowed_libc="uclibc-ng newlib"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=cris ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-cris"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=cris ADK_TARGET_ENDIAN=little ADK_TARGET_SYSTEM=toolchain-cris ADK_TARGET_CPU=crisv32"
+      cpu_arch=crisv32
+      march=cris
+      qemu=qemu-system-${march}
+      qemu_machine=axis-dev88
+      piggyback=1
+      ;;
+    frv)
+      allowed_libc="newlib"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=frv ADK_TARGET_SYSTEM=toolchain-frv"
+      ;;
+    ia64)
+      allowed_libc="glibc"
+      default_glibbc="ADK_APPLIANCE=new ADK_TARGET_ARCH=ia64 ADK_TARGET_SYSTEM=toolchain-ia64"
+      ;;
+    h8300)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=h8300 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-h8300"
+      ;;
+    lm32)
+      allowed_libc="uclibc-ng newlib"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=lm32 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-lm32"
+      ;;
+    m68k)
+      allowed_libc="uclibc-ng newlib"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=m68k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-m68k-q800"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=m68k ADK_TARGET_SYSTEM=toolchain-m68k"
+      ;;
+    m68k-nommu)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=m68k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-m68k-mcf5208"
+      ;;
+    metag)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc-ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=metag ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-metag"
+      cpu_arch=metag
+      qemu=qemu-system-meta
+      qemu_args="-display none -device da,exit_threads=1 -chardev stdio,id=chan1 -chardev pty,id=chan2"
+      qemu_machine=01sp
+      piggyback=1
+      ;;
+    microblazeel)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=little"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=little"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=little"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=microblaze ADK_TARGET_SYSTEM=toolchain-microblaze ADK_TARGET_ENDIAN=little"
+      cpu_arch=microblazeel
+      march=microblaze-ml605
+      qemu_machine=petalogix-ml605
+      dtbdir=openadk/target/microblaze
+      qemu_args="${qemu_args} -dtb ${dtbdir}/ml605.dtb"
+      ;;
+    microblazebe)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=big"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=big"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=big"
+      cpu_arch=microblaze
+      march=microblaze-ml605
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=petalogix-ml605
+      dtbdir=openadk/target/microblaze
+      qemu_args="${qemu_args} -dtb ${dtbdir}/ml605.dtb"
+      ;;
+    mips)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=mips ADK_TARGET_SYSTEM=toolchain-mips ADK_TARGET_ENDIAN=big"
+      cpu_arch=mips
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=hard
+      ;;
+    mipssf)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=soft"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=soft"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=soft"
+      cpu_arch=mips
+      march=mips
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=soft
+      ;;
+    mipsel)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=hard"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=hard"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=hard"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=mips ADK_TARGET_SYSTEM=toolchain-mips ADK_TARGET_ENDIAN=little"
+      cpu_arch=mipsel
+      march=mips
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=hard
+      ;;
+    mipselsf)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=soft"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=soft"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=soft"
+      cpu_arch=mipsel
+      march=mips
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=soft
+      ;;
+    mips64)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=o32"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=o32"
+      cpu_arch=mips64
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=o32
+      ;;
+    mips64n32)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n32"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n32"
+      cpu_arch=mips64
+      march=mips64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=n32
+      ;;
+    mips64n64)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n64"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n64"
+      cpu_arch=mips64
+      march=mips64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=n64
+      ;;
+    mips64el)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=o32"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=o32"
+      cpu_arch=mips64el
+      march=mips64
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=o32
+      ;;
+    mips64eln32)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n32"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n32"
+      cpu_arch=mips64el
+      march=mips64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=n32
+      ;;
+    mips64eln64)
+      allowed_libc="uclibc-ng glibc"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n64"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n64"
+      cpu_arch=mips64el
+      march=mips64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=malta
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      suffix=n64
+      ;;
+    ppcsf)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-bamboo ADK_TARGET_FLOAT=soft"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-bamboo ADK_TARGET_FLOAT=soft"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-bamboo ADK_TARGET_FLOAT=soft"
+      cpu_arch=ppc
+      march=ppc-bamboo
+      qemu=qemu-system-${cpu_arch}
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      qemu_machine=bamboo
+      suffix=soft
+      ;;
+    nios2)
+      allowed_libc="glibc"
+      default_glibc="ADK_APPLIANCE=new ADK_TARGET_ARCH=nios2 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-nios2"
+      ;;
+    or1k)
+      allowed_libc="uclibc-ng musl newlib"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=or1k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-or1k"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=or1k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-or1k"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=or1k ADK_TARGET_SYSTEM=toolchain-or1k"
+      ;;
+    ppc)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-macppc ADK_TARGET_FLOAT=hard"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-macppc ADK_TARGET_FLOAT=hard"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-macppc ADK_TARGET_FLOAT=hard"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=ppc ADK_TARGET_SYSTEM=toolchain-ppc"
+      cpu_arch=ppc
+      march=ppc-macppc
+      qemu=qemu-system-${cpu_arch}
+      qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
+      qemu_machine=mac99
+      suffix=hard
+      noappend=1
+      ;;
+    ppc64)
+      allowed_libc="glibc"
+      runtime_test="glibc"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc64 ADK_TARGET_ENDIAN=big"
+      cpu_arch=ppc64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=pseries
+      ;;
+    s390)
+      allowed_libc="glibc"
+      runtime_test="glibc"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=s390 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-s390"
+      cpu_arch=s390x
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=s390-ccw-virtio-2.4
+      ;;
+    sh2)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh2"
+      cpu_arch=sh2
+      ;;
+    sh3)
+      allowed_libc="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh3"
+      cpu_arch=sh3
+      ;;
+    sh4)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=little"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=little"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=little"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh4"
+      cpu_arch=sh4
+      march=sh
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=r2d
+      qemu_args="${qemu_args} -monitor null -serial null -serial stdio"
+      ;;
+    sh4eb)
+      allowed_libc="uclibc-ng musl glibc"
+      cpu_arch=sh4eb
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=big"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=big"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=big"
+      march=sh
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=r2d
+      qemu_args="${qemu_args} -monitor null -serial null -serial stdio"
+      ;;
+    sparc)
+      allowed_libc="uclibc-ng glibc newlib"
+      runtime_test="uclibc-ng glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=sparc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sparc"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=sparc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sparc"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=sparc ADK_TARGET_SYSTEM=toolchain-sparc"
+      cpu_arch=sparc
+      qemu_machine=SS-5
+      ;;
+    sparc64)
+      allowed_libc="glibc"
+      runtime_test="glibc"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=sparc64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sparc64"
+      cpu_arch=sparc64
+      qemu_machine=sun4u
+      qemu_args="${qemu_args} -net nic,model=e1000 -net user"
+      ;;
+    tile)
+      allowed_libc="glibc"
+      default_glibc="ADK_APPLIANCE=new ADK_TARGET_ARCH=tile ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-tile"
+      ;;
+    x86)
+      allowed_libc="uclibc-ng musl glibc newlib"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86"
+      default_newlib="ADK_APPLIANCE=new ADK_TARGET_ARCH=x86 ADK_TARGET_SYSTEM=toolchain-x86"
+      cpu_arch=i686
+      qemu=qemu-system-i386
+      qemu_machine=pc
+      qemu_args="${qemu_args}"
+      ;;
+    x86_64)
+      allowed_libc="uclibc-ng musl glibc"
+      runtime_test="uclibc-ng musl glibc"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86_64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86_64"
+      default_glibc="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86_64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86_64"
+      default_musl="ADK_APPLIANCE=test ADK_TARGET_ARCH=x86_64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-x86_64"
+      cpu_arch=x86_64
+      qemu_machine=pc
+      libdir=lib64
+      ;;
+    x86_64_x32)
+      allowed_libc="musl glibc"
+      cpu_arch=x86_64
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=pc
+      libdir=libx32
+      ;;
+    xtensa)
+      allowed_libc="uclibc-ng"
+      runtime_test="uclibc-ng"
+      default_uclibc_ng="ADK_APPLIANCE=test ADK_TARGET_ARCH=xtensa ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=xtensa"
+      cpu_arch=xtensa
+      qemu=qemu-system-${cpu_arch}
+      qemu_machine=lx60
+      qemu_args="${qemu_args} -cpu dc233c"
+      ;;
+    *)
+      echo "architecture ${arch} not supported"; exit 1;;
+  esac
+}
 
-	lib=$1
-	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}
-
-	case ${arch} in
-		aarch64)
-			cpu_arch=aarch64
-			qemu_machine=virt
-			qemu_args="${qemu_args} -cpu cortex-a57 -netdev user,id=eth0 -device virtio-net-device,netdev=eth0"
-			;;
-		armv5)
-			cpu_arch=arm
-			march=arm-versatilepb
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=versatilepb
-			suffix=soft_eabi
-			dtbdir=openadk/firmware/qemu-${march}_${lib}_${cpu_arch}_${suffix}
-			qemu_args="${qemu_args} -cpu arm926 -net user -net nic,model=smc91c111"
-			;;
-		armv7)
-			cpu_arch=arm
-			march=arm-vexpress-a9
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=vexpress-a9
-			suffix=hard_eabihf
-			dtbdir=openadk/firmware/qemu-${march}_${lib}_${cpu_arch}_${suffix}
-			qemu_args="${qemu_args} -cpu cortex-a9 -net user -net nic,model=lan9118 -dtb ${dtbdir}/vexpress-v2p-ca9.dtb"
-			;;
-		arcv1|arcv2)
-			emulator=nsim
-			cpu_arch=arc
-			piggyback=1
-			;;
-		arcv1-be)
-			emulator=nsim
-			cpu_arch=arceb
-			march=arcv1
-			piggyback=1
-			;;
-		arcv2-be)
-			emulator=nsim
-			cpu_arch=arceb
-			march=arcv2
-			piggyback=1
-			;;
-		crisv32)
-			cpu_arch=crisv32
-			march=cris
-			qemu=qemu-system-${march}
-			qemu_machine=axis-dev88
-			piggyback=1
-			;;
-		metag)
-			cpu_arch=metag
-			qemu=qemu-system-meta
-			qemu_args="-display none -device da,exit_threads=1 -chardev stdio,id=chan1 -chardev pty,id=chan2"
-			qemu_machine=01sp
-			piggyback=1
-			;;
-		microblazeel)
-			cpu_arch=microblazeel
-			march=microblaze-ml605
-			qemu_machine=petalogix-s3adsp1800
-			;;
-		microblazebe)
-			cpu_arch=microblaze
-			march=microblaze-ml605
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=petalogix-s3adsp1800
-			;;
-		mips) 
-			cpu_arch=mips
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=hard
-			;;
-		mipssf) 
-			cpu_arch=mips
-			march=mips
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=soft
-			;;
-		mipsel) 
-			cpu_arch=mipsel
-			march=mips
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=hard
-			;;
-		mipselsf) 
-			cpu_arch=mipsel
-			march=mips
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=soft
-			;;
-		mips64) 
-			cpu_arch=mips64
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=o32
-			;;
-		mips64n32) 
-			cpu_arch=mips64
-			march=mips64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=n32
-			;;
-		mips64n64) 
-			cpu_arch=mips64
-			march=mips64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=n64
-			;;
-		mips64el) 
-			cpu_arch=mips64el
-			march=mips64
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=o32
-			;;
-		mips64eln32) 
-			cpu_arch=mips64el
-			march=mips64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=n32
-			;;
-		mips64eln64) 
-			cpu_arch=mips64el
-			march=mips64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=malta
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			suffix=n64
-			;;
-		ppcsf)
-			cpu_arch=ppc
-			march=ppc-bamboo
-			qemu=qemu-system-${cpu_arch}
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			qemu_machine=bamboo
-			suffix=soft
-			;;
-		ppc)
-			cpu_arch=ppc
-			march=ppc-macppc
-			qemu=qemu-system-${cpu_arch}
-			qemu_args="${qemu_args} -device e1000,netdev=adk0 -netdev user,id=adk0"
-			qemu_machine=mac99
-			suffix=hard
-			noappend=1
-			;;
-		ppc64)
-			cpu_arch=ppc64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=pseries
-			;;
-		s390)
-			cpu_arch=s390x
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=s390-ccw-virtio-2.4
-			;;
-		sh4) 
-			cpu_arch=sh4
-			march=sh
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=r2d
-			qemu_args="${qemu_args} -monitor null -serial null -serial stdio"
-			;;
-		sh4eb) 
-			cpu_arch=sh4eb
-			march=sh
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=r2d
-			qemu_args="${qemu_args} -monitor null -serial null -serial stdio"
-			;;
-		sparc) 
-			cpu_arch=sparc
-			qemu_machine=SS-5
-			;;
-		sparc64) 
-			cpu_arch=sparc64
-			qemu_machine=sun4u
-			qemu_args="${qemu_args} -net nic,model=e1000 -net user"
-			;;
-		x86) 
-			cpu_arch=i686
-			qemu=qemu-system-i386
-			qemu_machine=pc
-			qemu_args="${qemu_args}"
-			;;
-		x86_64) 
-			cpu_arch=x86_64
-			qemu_machine=pc
-			libdir=lib64
-			;;
-		x86_64_x32) 
-			cpu_arch=x86_64
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=pc
-			libdir=libx32
-			;;
-		xtensa) 
-			cpu_arch=xtensa
-			qemu=qemu-system-${cpu_arch}
-			qemu_machine=lx60
-			qemu_args="${qemu_args} -cpu dc233c"
-			;;
-		*) 
-			echo "architecture ${arch} not supported"; exit 1;;
-	esac
-
-	case $emulator in
-		qemu) 
-			echo "Using QEMU as emulator"
-			if ! which $qemu >/dev/null; then
-				echo "Checking if $qemu is installed... failed"
-				exit 1
-			fi
-			qemuver=$(${qemu} -version|awk '{ print $4 }')
-			if [ "$arch" != "metag" ]; then
-			  if [ $(echo $qemuver |sed -e "s#\.##g" -e "s#,##") -lt 210 ];then
-				echo "Your qemu version is too old. Please update to 2.1 or greater"
-				exit 1
-			  fi
-			fi
-			;;
-		nsim)
-			echo "Using Synopsys NSIM as simulator"
-			if ! which nsimdrv >/dev/null; then
-				echo "Checking if $emulator is installed... failed"
-				exit 1
-			fi
-			;;
-		*)
-			echo "emulator/simulator not supported"; exit 1;;
-	esac
-	echo "Starting test for $lib and $arch"
-	# check if initramfs or piggyback is used
-	if [ $piggyback -eq 1 ]; then
-		echo "Using extra directory for test image creation"
-		root=openadk/extra
-		rm -rf openadk/extra 2>/dev/null
-		mkdir openadk/extra 2>/dev/null
-		if [ ! -z $suffix ]; then
-			kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/${emulator}-${march}-initramfspiggyback-kernel
-		else
-			kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-initramfspiggyback-kernel
-		fi
-	else
-		echo "Generating root filesystem for test run"
-		root=$(mktemp -d /tmp/XXXX)
-		if [ ! -z $suffix ]; then
-			archive=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/qemu-${march}-${lib}-initramfsarchive.tar.xz
-			kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/qemu-${march}-initramfsarchive-kernel
-		else
-			archive=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-${lib}-initramfsarchive.tar.xz
-			kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-initramfsarchive-kernel
-		fi
-
-		if [ ! -f $archive ];then
-			echo "No root filesystem available for architecture ${arch} tried $archive"
-			exit 1
-		fi
-		tar -xf $archive -C $root
-	fi
-
-	# creating test script to be run on boot
+runtest() {
+  lib=$1
+  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}
+
+  get_arch_info $arch $lib
+
+  case $emulator in
+    qemu)
+      echo "Using QEMU as emulator"
+      if ! which $qemu >/dev/null; then
+        echo "Checking if $qemu is installed... failed"
+        exit 1
+      fi
+      qemuver=$(${qemu} -version|awk '{ print $4 }')
+      if [ "$arch" != "metag" ]; then
+        if [ $(echo $qemuver |sed -e "s#\.##g" -e "s#,##") -lt 240 ]; then
+          echo "Your qemu version is too old. Please update to 2.4 or greater"
+          exit 1
+        fi
+      fi
+      ;;
+    nsim)
+      echo "Using Synopsys NSIM as simulator"
+      if ! which nsimdrv >/dev/null; then
+        echo "Checking if $emulator is installed... failed"
+        exit 1
+      fi
+      ;;
+    *)
+      echo "emulator/simulator not supported"
+      exit 1
+      ;;
+  esac
+
+  echo "Starting test for $lib and $arch"
+  # check if initramfs or piggyback is used
+  if [ $piggyback -eq 1 ]; then
+    echo "Using extra directory for test image creation"
+    root=openadk/extra
+    rm -rf openadk/extra 2>/dev/null
+    mkdir openadk/extra 2>/dev/null
+    if [ ! -z $suffix ]; then
+      kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/${emulator}-${march}-initramfspiggyback-kernel
+    else
+      kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-initramfspiggyback-kernel
+    fi
+  else
+    echo "Generating root filesystem for test run"
+    root=$(mktemp -d /tmp/XXXX)
+    if [ ! -z $suffix ]; then
+      archive=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/qemu-${march}-${lib}-initramfsarchive.tar.xz
+      kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}_${suffix}/qemu-${march}-initramfsarchive-kernel
+    else
+      archive=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-${lib}-initramfsarchive.tar.xz
+      kernel=openadk/firmware/${emulator}-${march}_${lib}_${cpu_arch}/${emulator}-${march}-initramfsarchive-kernel
+    fi
+
+    if [ ! -f $archive ]; then
+      echo "No root filesystem available for architecture ${arch} tried $archive"
+      exit 1
+    fi
+    tar -xf $archive -C $root
+  fi
+
+  # creating test script to be run on boot
 cat > ${root}/run.sh << EOF
 #!/bin/sh
 uname -a
 if [ \$ntpserver ]; then
-	rdate \$ntpserver
+  rdate \$ntpserver
 else
-	rdate time.fu-berlin.de
+  rdate time.fu-berlin.de
 fi
 EOF
 
-	if [ $test = "boot" ];then
+  # boot test
+  if [ $test = "boot" ]; then
 cat >> ${root}/run.sh << EOF
 file /bin/busybox
 size /bin/busybox
 for i in \$(ls /lib/*.so|grep -v libgcc);do
-	size \$i
+  size \$i
 done
 exit
 EOF
-	fi
-	if [ $test = "ltp" ];then
+  fi
+  # ltp test
+  if [ $test = "ltp" ]; then
 cat >> ${root}/run.sh << EOF
 /opt/ltp/runltp
 exit
 EOF
-	fi
-	if [ $test = "mksh" ];then
+  fi
+  # mksh test
+  if [ $test = "mksh" ]; then
 cat >> ${root}/run.sh << EOF
 mksh /opt/mksh/test.sh
 exit
 EOF
-	fi
-	if [ $test = "libc" ];then
-
-		case $lib in
-			uclibc-ng)
+  fi
+  # libc test
+  if [ $test = "libc" ]; then
+    case $lib in
+      uclibc-ng)
 cat >> ${root}/run.sh << EOF
 cd /opt/uclibc-ng/test
 sh ./uclibcng-testrunner.sh
 exit
 EOF
-			;;
-			musl|glibc)
+      ;;
+      musl|glibc)
 cat >> ${root}/run.sh << EOF
 cd /opt/libc-test
 CC=: make run
 exit
 EOF
-			;;
-		esac
-
-	fi
-	chmod u+x ${root}/run.sh
-
-	if [ $piggyback -eq 1 ]; then
-		(cd openadk && make v)
-	else
-		echo "Creating initramfs filesystem"
-		(cd $root; find . | cpio -o -C512 -Hnewc |xz --check=crc32 --stdout > ${topdir}/initramfs.${arch})
-		rm -rf $root
-		qemu_args="$qemu_args -initrd initramfs.${arch}"
-	fi
-
-	# qemu-ppc overwrites existing commandline
-	if [ $noappend -eq 0 ]; then
-		qemu_args="$qemu_args ${qemu_append}"
-	fi
-
-	echo "Now running the test ${test} in ${emulator} for architecture ${arch} and ${lib}"
-	case $emulator in
-		qemu)
-			echo "${qemu} -M ${qemu_machine} ${qemu_args} -kernel ${kernel} -qmp tcp:127.0.0.1:4444,server,nowait -no-reboot"
-			${qemu} -M ${qemu_machine} ${qemu_args} -kernel ${kernel} -qmp tcp:127.0.0.1:4444,server,nowait -no-reboot | tee REPORT.${arch}.${test}.${libver}
-			;;
-		nsim)
-			echo "./openadk/scripts/nsim.sh ${arch} ${kernel}"
-			./openadk/scripts/nsim.sh ${arch} ${kernel} | tee REPORT.${arch}.${test}.${libver}
-			;;
-	esac
-	if [ $? -eq 0 ];then
-		echo "Test ${test} for ${arch} finished. See REPORT.${arch}.${test}.${libver}"
-		echo 
-	else
-		echo "Test ${test} failed for ${arch} with ${lib} ${libver}."
-		echo 
-	fi
+      ;;
+    esac
+  fi
+  chmod u+x ${root}/run.sh
+
+  if [ $piggyback -eq 1 ]; then
+    (cd openadk && make v)
+  else
+    echo "Creating initramfs filesystem"
+    (cd $root; find . | cpio -o -C512 -Hnewc |xz --check=crc32 --stdout > ${topdir}/initramfs.${arch})
+    rm -rf $root
+    qemu_args="$qemu_args -initrd initramfs.${arch}"
+  fi
+
+  # qemu-ppc overwrites existing commandline
+  if [ $noappend -eq 0 ]; then
+    qemu_args="$qemu_args ${qemu_append}"
+  fi
+
+  echo "Now running the test ${test} in ${emulator} for architecture ${arch} and ${lib}"
+  case $emulator in
+    qemu)
+      echo "${qemu} -M ${qemu_machine} ${qemu_args} -kernel ${kernel} -qmp tcp:127.0.0.1:4444,server,nowait -no-reboot"
+      ${qemu} -M ${qemu_machine} ${qemu_args} -kernel ${kernel} -qmp tcp:127.0.0.1:4444,server,nowait -no-reboot | tee REPORT.${arch}.${test}.${libver}
+      ;;
+    nsim)
+      echo "./openadk/scripts/nsim.sh ${arch} ${kernel}"
+      ./openadk/scripts/nsim.sh ${arch} ${kernel} | tee REPORT.${arch}.${test}.${libver}
+      ;;
+  esac
+  if [ $? -eq 0 ]; then
+    echo "Test ${test} for ${arch} finished. See REPORT.${arch}.${test}.${libver}"
+  else
+    echo "Test ${test} failed for ${arch} with ${lib} ${libver}."
+  fi
 }
 
 compile() {
-	rm .config* .defconfig 2>/dev/null
-	make $1 defconfig
-	for pkg in $packages; do
-	  p=$(echo $pkg|tr '[:lower:]' '[:upper:]');printf "ADK_COMPILE_$p=y\nADK_PACKAGE_$p=y" >> .config
-	  yes|make oldconfig
-        done
-	# rebuild uClibc-ng package to get test-suite
-	if [ "$lib" = "uclibc-ng" ]; then
-		make package=$lib clean
-	fi
-	make $1 all
+  rm .config* .defconfig 2>/dev/null
+  make $1 defconfig
+  for pkg in $packages; do
+    p=$(echo $pkg|tr '[:lower:]' '[:upper:]');printf "ADK_COMPILE_$p=y\nADK_PACKAGE_$p=y" >> .config
+    yes|make oldconfig
+  done
+  make $1 all
 }
 
 build() {
-
-	lib=$1
-	arch=$2
-	test=$3
-
-	cd openadk
-
-	DEFAULT="ADK_TARGET_LIBC=$lib"
-	if [ $debug -eq 1 ];then
-		DEFAULT="$DEFAULT ADK_VERBOSE=1"
-	fi
-	if [ $test = "boot" ];then
-		DEFAULT="$DEFAULT ADK_TEST_BASE=y"
-	fi
-	if [ $test = "ltp" ];then
-		DEFAULT="$DEFAULT ADK_TEST_LTP=y"
-	fi
-	if [ $test = "mksh" ];then
-		DEFAULT="$DEFAULT ADK_TEST_MKSH=y"
-	fi
-	if [ $test = "libc" ];then
-		case $lib in
-			uclibc-ng)
-				DEFAULT="$DEFAULT ADK_TEST_UCLIBC_NG_TESTSUITE=y"
-				;;
-			glibc)
-				DEFAULT="$DEFAULT ADK_TEST_GLIBC_TESTSUITE=y"
-				;;
-			musl)
-				DEFAULT="$DEFAULT ADK_TEST_MUSL_TESTSUITE=y"
-				;;
-		esac
-	fi
-	if [ $test = "native" ];then
-		case $lib in
-			uclibc-ng)
-				DEFAULT="$DEFAULT ADK_TEST_UCLIBC_NG_NATIVE=y"
-				;;
-			musl)
-				DEFAULT="$DEFAULT ADK_TEST_MUSL_NATIVE=y"
-				;;
-			glibc)
-				DEFAULT="$DEFAULT ADK_TEST_GLIBC_NATIVE=y"
-				;;
-		esac
-	fi
-	case $arch in
-		aarch64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=aarch64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-aarch64"
-			compile "$DEFAULT"
-			;;
-		arcv1)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv1 ADK_TARGET_ENDIAN=little"
-			compile "$DEFAULT"
-			;;
-		arcv2)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv2 ADK_TARGET_ENDIAN=little"
-			compile "$DEFAULT"
-			;;
-		arcv1-be)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv1 ADK_TARGET_ENDIAN=big"
-			compile "$DEFAULT"
-			;;
-		arcv2-be)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arc ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=nsim-arcv2 ADK_TARGET_ENDIAN=big"
-			compile "$DEFAULT"
-			;;
-		armv5)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=arm ADK_TARGET_ENDIAN=little ADK_TARGET_SYSTEM=toolchain-arm"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-versatilepb"
-			fi
-			compile "$DEFAULT"
-			;;
-		armeb)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=arm ADK_TARGET_ENDIAN=big ADK_TARGET_SYSTEM=toolchain-arm"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-arm ADK_TARGET_FLOAT=soft ADK_TARGET_ENDIAN=big"
-			fi
-			compile "$DEFAULT"
-			;;
-		armv7)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=arm ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-arm-vexpress-a9" 
-			compile "$DEFAULT"
-			;;
-		avr32)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=avr32 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-avr32" 
-			compile "$DEFAULT"
-			;;
-		bfin)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=bfin ADK_TARGET_SYSTEM=toolchain-bfin"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=bfin ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-bfin"
-			fi
-			compile "$DEFAULT"
-			;;
-		c6x)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=c6x ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-c6x"
-			compile "$DEFAULT"
-			;;
-		crisv10)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=cris ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-cris ADK_TARGET_CPU=crisv10"
-			compile "$DEFAULT"
-			;;
-		crisv32)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=cris ADK_TARGET_ENDIAN=little ADK_TARGET_SYSTEM=toolchain-cris ADK_TARGET_CPU=crisv32"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=cris ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-cris"
-			fi
-			compile "$DEFAULT"
-			;;
-		ia64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=ia64 ADK_TARGET_SYSTEM=toolchain-ia64"
-			compile "$DEFAULT"
-			;;
-		h8300)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=h8300 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-h8300"
-			compile "$DEFAULT"
-			;;
-		lm32)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=$arch ADK_TARGET_SYSTEM=toolchain-$arch"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=$arch ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-$arch"
-			fi
-			compile "$DEFAULT"
-			;;
-		m68k)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=m68k ADK_TARGET_SYSTEM=toolchain-m68k"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=m68k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-m68k-q800"
-			fi
-			compile "$DEFAULT"
-			;;
-		m68k-nommu)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=m68k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-m68k-mcf5208"
-			compile "$DEFAULT"
-			;;
-		metag)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=metag ADK_TARGET_FS=initramfspiggyback ADK_TARGET_SYSTEM=qemu-metag"
-			compile "$DEFAULT"
-			;;
-		microblazebe)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=big"
-			compile "$DEFAULT"
-			;;
-		microblazeel)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=microblaze ADK_TARGET_SYSTEM=toolchain-microblaze ADK_TARGET_ENDIAN=little"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=microblaze ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-microblaze-ml605 ADK_TARGET_ENDIAN=little"
-			fi
-			compile "$DEFAULT"
-			;;
-		mips)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=mips ADK_TARGET_SYSTEM=toolchain-mips ADK_TARGET_ENDIAN=big"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=hard"
-			fi
-			compile "$DEFAULT"
-			;;
-		mipssf)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=big ADK_TARGET_FLOAT=soft" 
-			compile "$DEFAULT"
-			;;
-		mipsel)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=mips ADK_TARGET_SYSTEM=toolchain-mips ADK_TARGET_ENDIAN=little"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=hard"
-			fi
-			compile "$DEFAULT"
-			;;
-		mipselsf)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips ADK_TARGET_ENDIAN=little ADK_TARGET_FLOAT=soft"
-			compile "$DEFAULT"
-			;;
-		mips64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=o32"
-			compile "$DEFAULT"
-			;;
-		mips64n32)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n32"
-			compile "$DEFAULT"
-			;;
-		mips64n64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=big ADK_TARGET_ABI=n64"
-			compile "$DEFAULT"
-			;;
-		mips64el)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=o32"
-			compile "$DEFAULT"
-			;;
-		mips64eln32)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n32"
-			compile "$DEFAULT"
-			;;
-		mips64eln64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=mips64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-mips64 ADK_TARGET_ENDIAN=little ADK_TARGET_ABI=n64"
-			compile "$DEFAULT"
-			;;
-		nios2)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=nios2 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-nios2"
-			compile "$DEFAULT"
-			;;
-		or1k)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=$arch ADK_TARGET_SYSTEM=toolchain-$arch"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=or1k ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-or1k"
-			fi
-			compile "$DEFAULT"
-			;;
-		ppc)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=ppc ADK_TARGET_SYSTEM=toolchain-ppc"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-macppc ADK_TARGET_FLOAT=hard"
-			fi
-			compile "$DEFAULT"
-			;;
-		ppcsf)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc-bamboo ADK_TARGET_FLOAT=soft"
-			compile "$DEFAULT"
-			;;
-		ppc64)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=ppc64 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-ppc64 ADK_TARGET_ENDIAN=big"
-			compile "$DEFAULT"
-			;;
-		s390)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=s390 ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-s390"
-			compile "$DEFAULT"
-			;;
-		sh2)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh2"
-			compile "$DEFAULT"
-			;;
-		sh3)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh3"
-			compile "$DEFAULT"
-			;;
-		sh4)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=sh ADK_TARGET_SYSTEM=toolchain-sh ADK_TARGET_CPU=sh4"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=little"
-			fi
-			compile "$DEFAULT"
-			;;
-		sh4eb)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=sh ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-sh ADK_TARGET_ENDIAN=big"
-			compile "$DEFAULT"
-			;;
-		sparc|sparc64)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=$arch ADK_TARGET_SYSTEM=toolchain-$arch"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=$arch ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-$arch"
-			fi
-			compile "$DEFAULT"
-			;;
-		tile)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=tile ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=toolchain-tile"
-			compile "$DEFAULT"
-			;;
-		x86|x86_64)
-			if [ "$lib" = "newlib" ]; then
-				DEFAULT="$DEFAULT ADK_APPLIANCE=new ADK_TARGET_ARCH=$arch ADK_TARGET_SYSTEM=toolchain-$arch"
-			else
-				DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=$arch ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-$arch"
-			fi
-			compile "$DEFAULT"
-			;;
-		*)
-			DEFAULT="$DEFAULT ADK_APPLIANCE=test ADK_TARGET_ARCH=$arch ADK_TARGET_FS=initramfsarchive ADK_TARGET_SYSTEM=qemu-$arch"
-			compile "$DEFAULT"
-			;;
-	esac
-	if [ $? -ne 0 ];then
-		echo "build failed"
-		exit 1
-	fi
-	cd ..
+  lib=$1
+  arch=$2
+  test=$3
+
+  get_arch_info $arch $lib
+  cd openadk
+
+  DEFAULT="ADK_TARGET_LIBC=$lib"
+  if [ $debug -eq 1 ]; then
+    DEFAULT="$DEFAULT ADK_VERBOSE=1"
+  fi
+  if [ $test = "boot" ];then
+    DEFAULT="$DEFAULT ADK_TEST_BASE=y"
+  fi
+  if [ $test = "ltp" ];then
+    DEFAULT="$DEFAULT ADK_TEST_LTP=y"
+  fi
+  if [ $test = "mksh" ];then
+    DEFAULT="$DEFAULT ADK_TEST_MKSH=y"
+  fi
+  if [ $test = "libc" ];then
+    case $lib in
+      uclibc-ng)
+        DEFAULT="$DEFAULT ADK_TEST_UCLIBC_NG_TESTSUITE=y"
+        ;;
+      glibc)
+        DEFAULT="$DEFAULT ADK_TEST_GLIBC_TESTSUITE=y"
+        ;;
+      musl)
+        DEFAULT="$DEFAULT ADK_TEST_MUSL_TESTSUITE=y"
+        ;;
+    esac
+  fi
+  if [ $test = "native" ];then
+    case $lib in
+      uclibc-ng)
+        DEFAULT="$DEFAULT ADK_TEST_UCLIBC_NG_NATIVE=y"
+        ;;
+      musl)
+        DEFAULT="$DEFAULT ADK_TEST_MUSL_NATIVE=y"
+        ;;
+      glibc)
+        DEFAULT="$DEFAULT ADK_TEST_GLIBC_NATIVE=y"
+        ;;
+    esac
+  fi
+  case $lib in
+    uclibc-ng)
+      DEFAULT="$DEFAULT $default_uclibc_ng"
+      ;;
+    musl)
+      DEFAULT="$DEFAULT $default_musl"
+      ;;
+    glibc)
+      DEFAULT="$DEFAULT $default_glibc"
+      ;;
+    newlib)
+      DEFAULT="$DEFAULT $default_newlib"
+      ;;
+  esac
+
+  compile "$DEFAULT"
+  if [ $? -ne 0 ];then
+    echo "build failed"
+    exit 1
+  fi
+  cd ..
 }	
 
 for lib in ${libc}; do
-	case $lib in
-		uclibc-ng)
-			archlist=$arch_list_uclibcng
-			version=1.0.9
-			libver=uClibc-ng-${version}
-			libdir=uClibc-ng
-			;;
-		glibc)
-			archlist=$arch_list_glibc
-			version=2.22
-			libver=glibc-${version}
-			libdir=glibc
-			;;
-		musl)
-			archlist=$arch_list_musl
-			version=1.1.12
-			libver=musl-${version}
-			libdir=musl
-			;;
-		newlib)
-			archlist=$arch_list_newlib
-			version=2.2.0
-			libver=newlib-${version}
-			libdir=newlib
-			;;
-		*)
-			echo "$lib not supported"
-			exit 1
-			;;
-	esac
-	if [ ! -z $archs ]; then
-		archlist="$archs"
-	fi
-	if [ ! -z $source ]; then
-		if [ ! -d $source ]; then
-			echo "Not a directory."
-			exit 1
-		fi
-		usrc=$(mktemp -d /tmp/XXXX)
-		echo "Creating source tarball openadk/dl/${libver}.tar.xz"
-		cp -a $source $usrc/$libver
-		mkdir -p $topdir/openadk/dl 2>/dev/null
-		rm $topdir/openadk/dl/${libver}.tar.xz 2>/dev/null
-		(cd $usrc && tar cJf $topdir/openadk/dl/${libver}.tar.xz ${libver} )
-		touch $topdir/openadk/dl/${libver}.tar.xz.nohash
-	fi
-
-	# start with a clean dir
-	if [ $cleandir -eq 1 ]; then
-		echo "completely cleaning openadk build directory"
-		(cd openadk && make cleandir)
-	fi
-	if [ ! -z "$tests" ];then
-		testinfo="$tests testing"
-	else
-		testinfo="toolchain testing"
-	fi
-	echo "Summary: testing $archlist with C library $lib and $testinfo"
-	sleep 2
-	for arch in ${archlist}; do
-		if [ $cont -eq 1 ]; then
-		  if [ -f "REPORT.${arch}.${tests}.${libver}" -o -f "REPORT.${arch}.toolchain.${libver}" ]; then
-			echo "Skipping already run test for $arch"
-			continue
-		  fi
-		fi
-		if [ "$arch" = "$skiparchs" ];then
-			echo "Skipping $skiparchs"
-			continue
-		fi
-		if [ $clean -eq 1 ]; then
-			echo "cleaning openadk build directory"
-			(cd openadk && make cleansystem)
-		fi
-		echo "Compiling base system and toolchain for $lib and $arch"
-		build $lib $arch notest
-		echo "$arch with $lib successfully build" > REPORT.${arch}.toolchain.${libver}
-		if [ ! -z "$tests" ];then
-			for test in ${tests}; do
-				if [ $test = "boot" -o $test = "libc" -o $test = "ltp" -o $test = "native" -o $test = "mksh" ];then
-					case $lib in 
-					uclibc-ng)
-						case $arch in
-						armeb|avr32|bfin|c6x|crisv10|h8300|ia64|lm32|metag|microblazeel|microblazebe|m68k|m68k-nommu|nios2|or1k|sh2|sh3|sh4eb)
-							echo "runtime tests disabled for $arch."
-							;;
-						*)
-							build $lib $arch $test
-							runtest $lib $arch $test
-							;;
-						esac
-						;;
-					musl)
-						case $arch in
-						armeb|or1k|sh4eb)
-							echo "runtime tests disabled for $arch."
-							;;
-						*)
-							build $lib $arch $test
-							runtest $lib $arch $test
-							;;
-						esac
-						;;
-					glibc)
-						case $arch in
-						armeb|ia64|m68k|nios2|s390|sh4eb|tile)
-							echo "runtime tests disabled for $arch."
-							;;
-						*)
-							build $lib $arch $test
-							runtest $lib $arch $test
-							;;
-						esac
-						;;
-					newlib)
-						echo "runtime tests disabled for newlib."
-						;;
-					esac
-				else
-					echo "Test $test is not valid. Allowed tests: $valid_tests"
-					exit 1
-				fi
-			done
-		fi
-	done
+  case $lib in
+    uclibc-ng)
+      archlist=$arch_list_uclibcng
+      version=1.0.9
+      libver=uClibc-ng-${version}
+      libdir=uClibc-ng
+      ;;
+    glibc)
+      archlist=$arch_list_glibc
+      version=2.22
+      libver=glibc-${version}
+      libdir=glibc
+      ;;
+    musl)
+      archlist=$arch_list_musl
+      version=1.1.12
+      libver=musl-${version}
+      libdir=musl
+      ;;
+    newlib)
+      archlist=$arch_list_newlib
+      version=2.2.0
+      libver=newlib-${version}
+      libdir=newlib
+      ;;
+    *)
+      echo "$lib not supported"
+      exit 1
+      ;;
+  esac
+  if [ ! -z $archs ]; then
+    archlist="$archs"
+  fi
+  if [ ! -z $source ]; then
+    if [ ! -d $source ]; then
+      echo "Not a directory."
+      exit 1
+    fi
+    usrc=$(mktemp -d /tmp/XXXX)
+    echo "Creating source tarball openadk/dl/${libver}.tar.xz"
+    cp -a $source $usrc/$libver
+    mkdir -p $topdir/openadk/dl 2>/dev/null
+    rm $topdir/openadk/dl/${libver}.tar.xz 2>/dev/null
+    (cd $usrc && tar cJf $topdir/openadk/dl/${libver}.tar.xz ${libver} )
+    touch $topdir/openadk/dl/${libver}.tar.xz.nohash
+  fi
+
+  # start with a clean dir
+  if [ $cleandir -eq 1 ]; then
+    echo "completely cleaning openadk build directory"
+    (cd openadk && make cleandir)
+  fi
+  for arch in ${archlist}; do
+    get_arch_info $arch $lib
+    if [ $cont -eq 1 ]; then
+      if [ -f "REPORT.${arch}.${test}.${libver}" ]; then
+        echo "Skipping already run test $test for $arch and $lib"
+        continue
+      fi
+    fi
+    if [ "$arch" = "$skiparchs" ]; then
+      echo "Skipping $skiparchs"
+      continue
+    fi
+    if [ $clean -eq 1 ]; then
+      echo "cleaning openadk build directory"
+      (cd openadk && make cleansystem)
+    fi
+    if [[ "$allowed_libc" = *${lib}* ]]; then
+      echo "Compiling for $lib and $arch testing $test"
+      sleep 2
+      build $lib $arch $test
+      if [ "$test" != "toolchain" ]; then
+        if [[ "$runtime_test" = *${lib}* ]]; then
+          runtest $lib $arch $test
+        else
+          echo "runtime test disabled."
+        fi
+      fi
+    else
+      echo "$lib not available for $arch"
+    fi
+  done
 done
-
 echo "All tests finished."
 exit 0