]> Cypherpunks repositories - gostls13.git/commitdiff
misc/cgo/testcshared: make test.bash resilient against noise.
authorHyang-Ah Hana Kim <hyangah@gmail.com>
Fri, 24 Apr 2015 18:11:29 +0000 (14:11 -0400)
committerHyang-Ah Hana Kim <hyangah@gmail.com>
Fri, 24 Apr 2015 18:32:24 +0000 (18:32 +0000)
Instead of comparing against the entire output that may include
verbose warning messages, use the last line of the output and check
it includes the expected success message (PASS).

Change-Id: Iafd583ee5529a8aef5439b9f1f6ce0185e4b1331
Reviewed-on: https://go-review.googlesource.com/9304
Reviewed-by: David Crawshaw <crawshaw@golang.org>
misc/cgo/testcshared/test.bash

index ef8229542d00882cf9dff6224057dff36d4f3c9a..9a078e64857426b850958021ccf86c7143818be1 100755 (executable)
@@ -40,7 +40,11 @@ function run() {
                        args[$i]=${args[$i]//.\//${androidpath}\/}
                        args[$i]=${args[$i]//=./=${androidpath}}
                done
-               echo $(adb shell ${args} | tr -d '\r')
+               output=$(adb shell ${args} | tr -d '\r')
+               case $output in
+                       *PASS) echo "PASS";; 
+                       *) echo "$output";;
+               esac
                ;;
        *)
                echo $(env $@)