aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChih-hung Hsieh <chh@google.com>2019-12-03 16:45:50 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-12-03 16:45:50 -0800
commit8659e0009c56f9c1e821695c1757066fd7a64950 (patch)
treede17ff4aa773bd3709d59e6003f247f8616ff002
parent9677cb22d7263e24f16960031d1061f198722060 (diff)
parentb69cdae19ad1307dcc2fcb223d7b67cf5bc20870 (diff)
downloadproc-macro2-8659e0009c56f9c1e821695c1757066fd7a64950.tar.gz
Merge "Add auto_gen_config and TEST_MAPPING."
am: b69cdae19a Change-Id: Iea0e37319ae3ae9ce36fdea20e545dacc28cb9e7
-rw-r--r--Android.bp26
-rw-r--r--TEST_MAPPING24
2 files changed, 39 insertions, 11 deletions
diff --git a/Android.bp b/Android.bp
index df5e2a6..3cf41a9 100644
--- a/Android.bp
+++ b/Android.bp
@@ -20,10 +20,16 @@ rust_library_host_rlib {
}
rust_test_host {
- name: "proc-macro2_test_src_lib",
+ name: "proc-macro2_tests",
crate_name: "proc_macro2",
- srcs: ["src/lib.rs"],
- relative_install_path: "rust/proc-macro2",
+ srcs: [
+ "tests/features.rs",
+ "tests/marker.rs",
+ "tests/test.rs",
+ ],
+ relative_install_path: "proc-macro2_tests",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
edition: "2018",
features: [
"default",
@@ -35,20 +41,19 @@ rust_test_host {
"--cfg wrap_proc_macro",
],
rlibs: [
+ "libproc_macro2",
"libquote",
"libunicode_xid",
],
}
rust_test_host {
- name: "proc-macro2_tests_test",
+ name: "proc-macro2_tests_proc_macro2",
crate_name: "proc_macro2",
- srcs: [
- "tests/features.rs",
- "tests/marker.rs",
- "tests/test.rs",
- ],
- relative_install_path: "rust/proc-macro2",
+ srcs: ["src/lib.rs"],
+ relative_install_path: "proc-macro2_tests",
+ test_suites: ["general-tests"],
+ auto_gen_config: true,
edition: "2018",
features: [
"default",
@@ -60,7 +65,6 @@ rust_test_host {
"--cfg wrap_proc_macro",
],
rlibs: [
- "libproc_macro2",
"libquote",
"libunicode_xid",
],
diff --git a/TEST_MAPPING b/TEST_MAPPING
new file mode 100644
index 0000000..acd1a0c
--- /dev/null
+++ b/TEST_MAPPING
@@ -0,0 +1,24 @@
+{
+ "presubmit": [
+ {
+ "name": "proc-macro2_tests_proc_macro2",
+ "host": true
+ },
+ {
+ "name": "proc-macro2_tests_features",
+ "host": true
+ },
+ {
+ "name": "proc-macro2_tests_marker",
+ "host": true
+ },
+ {
+ "name": "proc-macro2_tests_test",
+ "host": true
+ },
+ {
+ "name": "proc-macro2_tests_marker",
+ "host": true
+ }
+ ]
+}