Merge commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1' * commit '6d74e724d0cc067dbb30a5512ad45c1ae7a8f3e1': Add unit test for new keystore.
This commit is contained in:
@@ -94,6 +94,13 @@ See test_defs.xsd for more information.
|
|||||||
class="com.android.unit_tests.activity.ActivityTests"
|
class="com.android.unit_tests.activity.ActivityTests"
|
||||||
coverage_target="framework" />
|
coverage_target="framework" />
|
||||||
|
|
||||||
|
<test name="keystore-unit"
|
||||||
|
build_path="frameworks/base/keystore/tests"
|
||||||
|
package="android.security.tests"
|
||||||
|
runner=".KeyStoreTestRunner"
|
||||||
|
coverage_target="framework"
|
||||||
|
continuous="true" />
|
||||||
|
|
||||||
<test name="vpntests"
|
<test name="vpntests"
|
||||||
build_path="frameworks/base/tests/AndroidTests"
|
build_path="frameworks/base/tests/AndroidTests"
|
||||||
package="com.android.unit_tests"
|
package="com.android.unit_tests"
|
||||||
@@ -514,12 +521,6 @@ 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" />
|
||||||
|
|
||||||
<!-- Android Keystore tests -->
|
|
||||||
<test-native name="netkeystore_test"
|
|
||||||
build_path="frameworks/base/cmds/keystore/tests"
|
|
||||||
description="Android keystore."
|
|
||||||
extra_build_args="KEYSTORE_TESTS=1" />
|
|
||||||
|
|
||||||
<!-- pending patch 820
|
<!-- pending patch 820
|
||||||
<test-native name="gtest"
|
<test-native name="gtest"
|
||||||
build_path="external/gtest"
|
build_path="external/gtest"
|
||||||
|
|||||||
Reference in New Issue
Block a user