Tweak to use common and arch specific binaries

Signed-off-by: Martyn Welch <martyn.welch@collabora.co.uk>

apparmor-dbus.yaml

@@ -12,7 +12,7 @@ metadata:
 
 run:
   steps:
-  - LAUNCH_DBUS="no" ./run-aa-test ./dbus.expected ./dbus
+  - LAUNCH_DBUS="no" common/run-aa-test ./dbus.expected ./dbus
 
 parse:
   pattern: 'RESULT:(?P<result>\w+):(?P<test_case_id>[^:]+):'

dbus

 #!/bin/sh
 # vim: set sts=4 sw=4 et tw=0 :
 
+case `uname -m` in
+x86_64) PREFIX=amd64/bin; ;;
+armv7l) PREFIX=armhf/bin; ;;
+aarch64) PREFIX=arm64/bin; ;;
+esac
+
 echo "$0: setup"
 . common/common.sh
 ensure_dbus_session
@@ -10,7 +16,7 @@ dbus-monitor &
 MONITOR_PID=$!
 
 echo "$0: running server"
-./dbus-server &
+${PREFIX}/dbus-server &
 SERVER_PID=$!
 
 echo "$0: waiting a second"