OSDN Git Service
(root)
/
android-x86
/
development.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4b6a0c7
18d7a4e
)
resolved conflicts for merge of 18d7a4e3 to master
author
niko
<niko@google.com>
Tue, 16 Jun 2009 15:19:25 +0000
(08:19 -0700)
committer
niko
<niko@google.com>
Tue, 16 Jun 2009 15:19:25 +0000
(08:19 -0700)
1
2
testrunner/test_defs.xml
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
testrunner/test_defs.xml
index
8982202
,
43bbfdd
..
f1346e3
---
1
/
testrunner/test_defs.xml
---
2
/
testrunner/test_defs.xml
+++ b/
testrunner/test_defs.xml
@@@
-494,10
-485,12
+496,16
@@@
Native tests
description="Bionic libstdc++."
extra_make_args="BIONIC_TESTS=1" />
+<test-native name="libskia"
+ 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"