Fix ui-automation tests run script.

Author: alexmx

ui-automation/run-tests.sh

@@ -1,8 +1,12 @@
 #!/bin/sh
 
+realpath() {
+    [[ $1 = /* ]] && echo "$1" || echo "$PWD/${1#./}"
+}
+
 XCODE_PATH=`xcode-select -print-path`
 TRACETEMPLATE="/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.xrplugin/Contents/Resources/Automation.tracetemplate"
-APP_LOCATION=$1
+APP_LOCATION=$(realpath "$1")
 DEVICE_ID=$2
 
 if [ ! $# -gt 1 ]; then
@@ -12,12 +16,6 @@ if [ ! $# -gt 1 ]; then
 	exit -1
 fi
 
-# If running on device, only need name of app, full path not important
-if [ ! "$DEVICE_ID" = "" ]; then
-  RUN_ON_SPECIFIC_DEVICE_OPTION="$DEVICE_ID"
-  APP_LOCATION=`basename $APP_LOCATION`
-fi
-
 # Create junit reporting directory
 if [ ! -d "test-reports" ]; then
   mkdir test-reports
@@ -28,17 +26,17 @@ for script in specs/*
 do
     if [[ -f $script ]]; then
       echo $script
-      instruments -w "$RUN_ON_SPECIFIC_DEVICE_OPTION" \
+      instruments -w "$DEVICE_ID" \
         -t $TRACETEMPLATE \
         $APP_LOCATION \
         -e UIASCRIPT $script \
         -e UIARESULTSPATH /var/tmp | grep "<"  > test-reports/test-results.xml
+      
+      # cleanup the tracefiles produced from instruments
+      rm -rf *.trace
     fi
 done
 
-# cleanup the tracefiles produced from instruments
-rm -rf *.trace
-
 # fail script if any failures have been generated
 if [ `grep "<failure>" test-reports/test-results.xml | wc -l` -gt 0 ]; then
   echo 'Build Failed'