Added gtest to the list. cd to /sdcard before running native tests.
Some test need to be run in a place where they can write on the disk. I know we should stop using /sdcard but until I see the new document explaining how the launcher can access the playground, we are going to keep it that way.
This commit is contained in:
@@ -561,12 +561,12 @@ See test_defs.xsd for more information.
|
|||||||
description="Android STL."
|
description="Android STL."
|
||||||
extra_build_args="ASTL_TESTS=1" />
|
extra_build_args="ASTL_TESTS=1" />
|
||||||
|
|
||||||
<!-- pending patch 820
|
<!-- Google Test -->
|
||||||
<test-native name="gtest"
|
<test-native name="gtest"
|
||||||
build_path="external/gtest"
|
build_path="external/gtest"
|
||||||
description="Google test."
|
description="Google test."
|
||||||
extra_build_args="GTEST_TESTS=1" />
|
extra_build_args="GTEST_TESTS=1" />
|
||||||
-->
|
|
||||||
|
|
||||||
<!-- host java tests -->
|
<!-- host java tests -->
|
||||||
<test-host name="cts-appsecurity"
|
<test-host name="cts-appsecurity"
|
||||||
|
|||||||
@@ -86,7 +86,7 @@ class NativeTestSuite(test_suite.AbstractTestSuite):
|
|||||||
|
|
||||||
# Single quotes are needed to prevent the shell splitting it.
|
# Single quotes are needed to prevent the shell splitting it.
|
||||||
output = adb.SendShellCommand("'%s 2>&1;echo -n exit code:$?'" %
|
output = adb.SendShellCommand("'%s 2>&1;echo -n exit code:$?'" %
|
||||||
full_path,
|
"(cd /sdcard;%s)" % full_path,
|
||||||
int(options.timeout))
|
int(options.timeout))
|
||||||
success = output.endswith("exit code:0")
|
success = output.endswith("exit code:0")
|
||||||
logger.Log("%s... %s" % (f, success and "ok" or "failed"))
|
logger.Log("%s... %s" % (f, success and "ok" or "failed"))
|
||||||
|
|||||||
Reference in New Issue
Block a user