From 2c54b66f2584317350aedf037787070d4bd5ee15 Mon Sep 17 00:00:00 2001 From: harigopal-gollamudi Date: Fri, 28 Feb 2014 13:59:08 +0530 Subject: Parsing string is updated & path for media files is changed Change-Id: I3e6e966e687b96f30122cd7b8dfd55035bcaf43a --- android/mmtest.yaml | 2 +- android/scripts/mmtest.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/android/mmtest.yaml b/android/mmtest.yaml index 31e5007..5f71b13 100644 --- a/android/mmtest.yaml +++ b/android/mmtest.yaml @@ -20,4 +20,4 @@ run: - "./android/scripts/mmtest.sh" parse: - pattern: "^(?P\\w+)\\s+\\w+\\s+\\w+\\s+(?P\\w+)\\s*$" + pattern: "^\\s*(?Ptest\\w+)\\s+(?P\w\+)\\s*$" diff --git a/android/scripts/mmtest.sh b/android/scripts/mmtest.sh index 6a1f999..5398358 100755 --- a/android/scripts/mmtest.sh +++ b/android/scripts/mmtest.sh @@ -33,7 +33,7 @@ setprop net.dns1 8.8.8.8 echo "Content downloading" -cd /mnt/sdcard/ +cd /mnt/media_rw/sdcard0 mkdir media_api cd media_api @@ -89,13 +89,13 @@ wget http://samplemedia.linaro.org/Mmtest/media_api/videoeditor/H264_BP_640x480_ wget http://samplemedia.linaro.org/Mmtest/media_api/videoeditor/H264_BP_640x480_15fps_384kbps_60_0.mp4 -if [ -f /mnt/sdcard/media_api/music/test_amr_ietf.amr ] +if [ -f /mnt/media_rw/sdcard0/media_api/music/test_amr_ietf.amr ] then echo "file is downloaded" fi logcat -c -am instrument -r -e targetDir /sdcard/media_api/music -w com.android.mediaframeworktest/.MediaFrameworkTestRunner > stdout.log +am instrument -r -e targetDir /storage/sdcard0/media_api/music -w com.android.mediaframeworktest/.MediaFrameworkTestRunner > stdout.log -grep -A 1 "INSTRUMENTATION_STATUS: test=" stdout.log | egrep "INSTRUMENTATION_STATUS: test=|INSTRUMENTATION_STATUS_CODE:" |cut -d'=' -f 2 |cut -d ':' -f 2 |xargs -n 4 |sed -e 's/0/pass/g' -e 's/-1/fail/g' -e 's/-2/fail/g' +egrep "INSTRUMENTATION_STATUS: test=|INSTRUMENTATION_STATUS_CODE:" stdout.log |cut -d'=' -f 2 |cut -d ':' -f 2 |xargs -n 4 |sed -e 's/0/pass/g' -e 's/-1/fail/g' -e 's/-2/fail/g' | awk '{$1=""; print $3" "$4}' -- cgit v1.2.3