Added qemu-test.sh for FileCheck testing, updated run-qemu.sh to chec…

…k for missing ELF file

qemu-test.sh

@@ -0,0 +1,58 @@
+#!/bin/bash
+# QEMU Invocation for testing without graphics
+# see https://www.qemu.org/docs/master/system/invocation.html
+
+set -o nounset 
+set -o errexit
+
+QEMU_PATH="xpack-qemu-arm-2.8.0-9/bin/qemu-system-gnuarmeclipse"
+QEMU_DIRS=". $HOME /opt"
+
+TARGET=Application.elf
+IMAGE=./build/debug/$TARGET
+
+function usage {
+  cat <<EOT
+Usage: ${0#.*/} [elf-image]
+  Launch QEMU from either local sub-directory, home or /opt directory.
+  Filters startup diagnostic messages so output suitable for FileCheck testing
+  Options:
+    --help      -- this help information also -h -?
+  Use Ctrl-A X to quit QEMU.
+EOT
+  exit 1
+}
+
+DIAG='-serial telnet:localhost:8888,server,nodelay'
+SERIAL='-serial tcp::7777,server,nodelay'
+
+for arg; do
+  case "$arg" in
+    *.ELF|*.elf)   IMAGE="$arg" ;;
+    *)             echo "Unrecognised command argument: $arg" >&2
+	           usage ;;
+    esac
+done
+
+for dir in $QEMU_DIRS; do
+  QEMU="$dir/$QEMU_PATH"
+  [[ -x $QEMU ]] && break
+  QEMU=
+done
+
+if [[ -z $QEMU ]]; then
+  echo "Cannot find QEMU in standard locations: $QEMU_DIRS" >&2
+  exit 1
+fi
+
+if [[ ! -f "$IMAGE" ]]; then
+  echo "Missing image file: $IMAGE" >&2
+  exit 1
+fi
+
+$QEMU --board Feabhas-WMS -d unimp,guest_errors \
+      --semihosting-config enable=on,target=native \
+      -nographic \
+      --image "$IMAGE" 2>&1 \
+      | sed -e '1,/^(qemu) diagnostic/d'
+

run-qemu.sh

@@ -2,9 +2,15 @@
 # QEMU Invocation
 # see https://www.qemu.org/docs/master/system/invocation.html
 
+set -o nounset 
+set -o errexit
+
 TARGET=Application.elf
 IMAGE=./build/debug/$TARGET
 
+QEMU_PATH="xpack-qemu-arm-2.8.0-9/bin/qemu-system-gnuarmeclipse"
+QEMU_DIRS=". $HOME /opt"
+
 function usage {
   cat <<EOT
 Usage: ${0#.*/} [qemu-options] [diag] [gdb] [serial] [elf-image]
@@ -15,14 +21,12 @@ Usage: ${0#.*/} [qemu-options] [diag] [gdb] [serial] [elf-image]
     gdb           - start GDB server on port 1234
     --nographic   - switch off graphic support
     --sdl2        - use built-in graphics instead of remote port 8888
+    --help     -- this help information also -h -?
   Use Ctrl-A X to quit QEMU if using --nographic.
 EOT
   exit 1
 }
 
-QEMU_PATH="xpack-qemu-arm-2.8.0-9/bin/qemu-system-gnuarmeclipse"
-QEMU_DIRS=". $HOME /opt"
-
 DIAG='-serial telnet:localhost:8888,server,nodelay'
 GRAPHIC=
 GDB=
@@ -40,7 +44,7 @@ for arg; do
     --sdl2)        GRAPHIC=y; DIAG= ;;
     -*)            OPTIONS="$OPTIONS $arg" ;;
     *)             echo "Unrecognised command argument: $arg" >&2
-	                 usage ;;
+	           usage ;;
     esac
 done
 
@@ -50,17 +54,23 @@ for dir in $QEMU_DIRS; do
   QEMU=
 done
 
-if [[ -z $QEMU ]]; then
+if [[ -z "$QEMU" ]]; then
   echo "Cannot find QEMU in standard locations: $QEMU_DIRS" >&2
   exit 1
 fi
 
+if [[ ! -f "$IMAGE" ]]; then
+  echo "Missing image file: $IMAGE" >&2
+  exit 1
+fi
+
 if [[ -z "$GRAPHIC" ]]; then
   OPTIONS="$OPTIONS -nographic --chardev file,path=/dev/tty,mux=on,id=c0 -mon chardev=c0 -serial chardev:c0"
 fi
 
 set -x
-$QEMU --verbose --board Feabhas-WMS -d unimp,guest_errors \
-      --semihosting-config enable=on,target=native \
-      $OPTIONS $GDB $SERIAL $DIAG \
-      --image $IMAGE
+"$QEMU" --verbose --board Feabhas-WMS -d unimp,guest_errors \
+        --semihosting-config enable=on,target=native \
+        $OPTIONS $GDB $SERIAL $DIAG \
+        --image "$IMAGE"
+