]> Cypherpunks repositories - gostls13.git/commitdiff
misc/cgo/testcshared: actually run test executable on android
authorAlex Brainman <alex.brainman@gmail.com>
Mon, 11 Sep 2017 07:19:24 +0000 (17:19 +1000)
committerAlex Brainman <alex.brainman@gmail.com>
Mon, 11 Sep 2017 09:22:44 +0000 (09:22 +0000)
CL 62593 broken TestExportedSymbols and TestUnexportedSymbols
because it started executing android test binary on host.
Make them run on android.

Hopefully fixes android build.

Change-Id: Ic0bb9f0cbbefca23828574282caa33a03ef72431
Reviewed-on: https://go-review.googlesource.com/62830
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Elias Naur <elias.naur@gmail.com>
misc/cgo/testcshared/cshared_test.go

index b25e4a9825b6465f1c92bab637b4dc41dfd3f28a..db8b5082fc02ff7db5ce3f1243e96267afe4dd51 100644 (file)
@@ -285,7 +285,7 @@ func TestExportedSymbols(t *testing.T) {
 
        defer os.Remove(cmd)
 
-       out := run(t, append(gopathEnv, "LD_LIBRARY_PATH=."), cmdToRun(cmd))
+       out := runExe(t, append(gopathEnv, "LD_LIBRARY_PATH=."), cmdToRun(cmd))
        if strings.TrimSpace(out) != "PASS" {
                t.Error(out)
        }
@@ -337,7 +337,7 @@ func TestUnexportedSymbols(t *testing.T) {
        defer os.Remove(libname)
        defer os.Remove(cmd)
 
-       out := run(t, append(gopathEnv, "LD_LIBRARY_PATH=."), cmdToRun(cmd))
+       out := runExe(t, append(gopathEnv, "LD_LIBRARY_PATH=."), cmdToRun(cmd))
 
        if strings.TrimSpace(out) != "PASS" {
                t.Error(out)