Merge lp:~liuyq0307/lava-android-test/sdcard-mounted into lp:lava-android-test

[Yongqin Liu]

add test for checking if the sdcard partition is mounted

[Zygmunt Krynicki (zyga)]

50 + echo "Usage $0 [--serial|-s serial]"

I'd say this is confusing/incorrect as both options can consume optional argument.

In addition $0 is whatever was execed (which is fine) but it tends to be long (/usr/bin/foobar)

[Andy Doan (doanac)]

On 09/12/2012 07:13 AM, Zygmunt Krynicki wrote:
> In addition $0 is whatever was execed (which is fine) but it tends to be long (/usr/bin/foobar)

funny, I've always been a fan of $0 there because it can help debugging
odd things at times :) Hadn't thought of that perspective.

[Antonio Terceiro (terceiro)]

Zygmunt Krynicki escreveu:
> In addition $0 is whatever was execed (which is fine) but it tends to
> be long (/usr/bin/foobar)

I usually use $(basename $0) to avoid very long names.

[lp:~liuyq0307/lava-android-test/sdcard-mounted]

207. By Yongqin Liu on 2012-09-13

use $(basename $0) instead of $0 in usage

[Yongqin Liu (liuyq0307)]

> 50 + echo "Usage $0 [--serial|-s serial]"
>
> I'd say this is confusing/incorrect as both options can consume optional
> argument.
sorry, why you say that's confusing/incorrect?
by that I just want to say that we support both follow commands:
  sdcard-mounted.sh --serial serial
  sdcard-mounted.sh --s serial

And I just borrow this code from lava-partition-disk in lp:lava-master-image-scripts,
did not see the difference between the usage of them.:(

> In addition $0 is whatever was execed (which is fine) but it tends to be long
> (/usr/bin/foobar)
changed to use $(basename $0)

[Zygmunt Krynicki (zyga)]

W dniu 13.09.2012 04:05, Yongqin Liu pisze:
>> 50 + echo "Usage $0 [--serial|-s serial]"
>>
>> I'd say this is confusing/incorrect as both options can consume optional
>> argument.
> sorry, why you say that's confusing/incorrect?
> by that I just want to say that we support both follow commands:
> sdcard-mounted.sh --serial serial
> sdcard-mounted.sh --s serial

The fact that they take an optional argument.

Sorry for making my previous argument confusing, I would just use
something like this instead:

Usage: sdcard-mounted.sh [OPTIONS]

Available options:

    -s [SERIAL] | --serial [SERIAL]
  The serial device to connect to.
  TODO: Describe what is the default value
  when --serial|-s is passed without an argument

>> In addition $0 is whatever was execed (which is fine) but it tends to be long
>> (/usr/bin/foobar)
> changed to use $(basename $0)

I second that, $(basename $0) is a simple solution

Thanks
ZK

[lp:~liuyq0307/lava-android-test/sdcard-mounted]

208. By Yongqin Liu on 2012-09-13

update the usage style

Unmerged revisions

=== modified file 'lava_android_test/test_definitions/hostshells/example.sh'
--- lava_android_test/test_definitions/hostshells/example.sh	2012-07-10 06:34:06 +0000
+++ lava_android_test/test_definitions/hostshells/example.sh	2012-09-13 08:47:18 +0000
@@ -27,7 +27,8 @@
                 if [ -n "${SERIAL}" ]; then
                     shift 2
                 else
-                    shift 1
+                    show_usage
+                    exit 1
                 fi
                 ;;
             --help|-h)
@@ -48,8 +49,8 @@
 
 function show_usage(){
     # Display the usage line
-    echo "Usage $0 [--serial|-s serial] other-option"
-    echo "Usage $0 [--help|-h]"
+    echo "Usage $(basename $0) [--serial <serial>|-s <serial>] <other-option>"
+    echo "Usage $(basename $0) [--help|-h]"
 }
 
 function main(){

=== added file 'lava_android_test/test_definitions/hostshells/sdcard-mounted.sh'
--- lava_android_test/test_definitions/hostshells/sdcard-mounted.sh	1970-01-01 00:00:00 +0000
+++ lava_android_test/test_definitions/hostshells/sdcard-mounted.sh	2012-09-13 08:47:18 +0000
@@ -0,0 +1,65 @@
+#!/bin/bash
+# Copyright (c) 2012 Linaro
+
+# Author: Linaro Validation Team <[e-mail]>
+#
+# This file is part of LAVA Android Test.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+function parse_argv() {
+    # Parse command line arguments
+    while test -n "$1"; do
+        case "$1" in
+            --serial|-s)
+                SERIAL="$2"
+                if [ -n "${SERIAL}" ]; then
+                    shift 2
+                else
+                    show_usage
+                    exit 1
+                fi
+                ;;
+            --help|-h)
+                show_usage
+                exit 1
+                ;;
+            *)
+                shift
+                ;;
+        esac
+    done
+}
+
+function show_usage(){
+    # Display the usage line
+    echo "Usage $(basename $0) [--serial <serial>|-s <serial>]"
+    echo "Usage $(basename $0) [--help|-h]"
+}
+
+function main(){
+    parse_argv "$@"
+    ADB_OPTION=''
+    if [ -n "${SERIAL}" ]; then
+        ADB_OPTION="-s ${SERIAL}"
+    fi
+    adb ${ADB_OPTION} shell mount |grep 'sdcard '
+    if [ $? -eq 0 ]; then
+        echo "sdcard-mounted=pass"
+    else
+        echo "sdcard-mounted=fail"
+    fi
+}
+
+main "$@"