Mark ab/6881855 as merged
Bug: 172690556
Change-Id: I763715aaf21ef097afebdd0b9bb80ca18a940820
diff --git a/Android.bp b/Android.bp
index 8c2f9c7..d0ceb10 100644
--- a/Android.bp
+++ b/Android.bp
@@ -2,6 +2,7 @@
name: "libtinyxml2",
host_supported: true,
vendor_available: true,
+ product_available: true,
recovery_available: true,
vndk: {
enabled: true,
@@ -32,10 +33,21 @@
}
cc_test {
- name: "tinyxml2-tests",
+ name: "tinyxml2-xmltest",
srcs: ["xmltest.cpp"],
shared_libs: ["libtinyxml2"],
data: [
"resources/**/*",
],
}
+
+sh_test {
+ name: "tinyxml2-tests",
+ src: "run-tinyxml2-tests-on-android.sh",
+ filename: "run-tinyxml2-tests-on-android.sh",
+ test_suites: ["general-tests"],
+ host_supported: true,
+ device_supported: false,
+ require_root: true,
+ target_required: ["tinyxml2-xmltest"],
+}
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..60222f9
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+ "presubmit": [
+ {
+ "name": "tinyxml2-tests"
+ }
+ ]
+}
diff --git a/run-tinyxml2-tests-on-android.sh b/run-tinyxml2-tests-on-android.sh
new file mode 100755
index 0000000..a3b2a41
--- /dev/null
+++ b/run-tinyxml2-tests-on-android.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+# Copy the tests across.
+adb sync
+
+if tty -s; then
+ green="\033[1;32m"
+ red="\033[1;31m"
+ plain="\033[0m"
+else
+ green=""
+ red=""
+ plain=""
+fi
+
+failures=0
+
+check_failure() {
+ if [ $? -eq 0 ]; then
+ echo -e "${green}[PASS]${plain}"
+ else
+ failures=$(($failures+1))
+ echo -e "${red}[FAIL]${plain}"
+ fi
+}
+
+if [ -e "$ANDROID_PRODUCT_OUT/data/nativetest/tinyxml2-xmltest/tinyxml2-xmltest" ]; then
+ adb shell "cd /data/nativetest/tinyxml2-xmltest; ./tinyxml2-xmltest"
+ check_failure
+fi
+if [ -e "$ANDROID_PRODUCT_OUT/data/nativetest64/tinyxml2-xmltest/tinyxml2-xmltest" ]; then
+ adb shell "cd /data/nativetest64/tinyxml2-xmltest; ./tinyxml2-xmltest"
+ check_failure
+fi
+
+echo "_________________________________________________________________________"
+echo
+if [ $failures -ne 0 ]; then
+ echo -e "${red}FAILED${plain}: $failures"
+fi
+exit $failures
