diff options
| author | niko <niko@google.com> | 2009-06-16 08:19:25 -0700 |
|---|---|---|
| committer | niko <niko@google.com> | 2009-06-16 08:19:25 -0700 |
| commit | a282b76b8937a49566fba385421c305c2e89da80 (patch) | |
| tree | a0be6277e20b0560f229e49ccfc73358125182f9 /testrunner | |
| parent | 4b6a0c77ba5e6c0f9d22ff3b008bae1c1c97bccd (diff) | |
| parent | 18d7a4e3bcaa07fb976864cef864a836f81142f4 (diff) | |
| download | android_development-a282b76b8937a49566fba385421c305c2e89da80.tar.gz android_development-a282b76b8937a49566fba385421c305c2e89da80.tar.bz2 android_development-a282b76b8937a49566fba385421c305c2e89da80.zip | |
resolved conflicts for merge of 18d7a4e3 to master
Diffstat (limited to 'testrunner')
| -rw-r--r-- | testrunner/test_defs.xml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/testrunner/test_defs.xml b/testrunner/test_defs.xml index 8982202d1..f1346e3f3 100644 --- a/testrunner/test_defs.xml +++ b/testrunner/test_defs.xml @@ -489,6 +489,8 @@ Native tests: --> <!-- native tests --> + +<!-- Bionic C++ --> <test-native name="libstdcpp" build_path="system/extras/tests/bionic/libstdc++" description="Bionic libstdc++." @@ -498,6 +500,12 @@ Native tests: build_path="external/skia/tests" description="Skia tests." /> +<!-- Android STL tests --> +<test-native name="astl" + build_path="external/astl/tests" + description="Android STL." + extra_make_args="ASTL_TESTS=1" /> + <!-- pending patch 820 <test-native name="gtest" build_path="external/gtest" |