diff options
author | Chih-Hung Hsieh <chh@google.com> | 2019-11-17 21:44:05 -0800 |
---|---|---|
committer | Chih-Hung Hsieh <chh@google.com> | 2019-11-17 21:44:05 -0800 |
commit | feecafdb866c3f435bd7b8f26b5f747e28ab3ef6 (patch) | |
tree | f3b4f0f725ae179c88e9f2a088f42c1b836cffb5 | |
parent | 0297e0f98d5067dc350af708d396ee7f0a46b69c (diff) | |
download | adhd-feecafdb866c3f435bd7b8f26b5f747e28ab3ef6.tar.gz |
Add rust_test modules and TEST_MAPPING.
* The Cargo.toml files need to be fixed first,
then the Android.bp files were generated by
cargo2android.py --tests --run
* Manually add defaults to limit build host.
* Manually add TEST_MAPPING to select all rust_test modules.
* Fixes to Cargo.toml files are:
* correcting file path to crosvm
* appending an empty '[workspace]' section
Bug: 140938178
Test: atest --include-subdirs --rebuild-module-info external/adhd
Change-Id: Ic1493347cf285ad81a174072ce1abd30d9764ecf
-rw-r--r-- | audio_streams/Android.bp | 13 | ||||
-rw-r--r-- | audio_streams/TEST_MAPPING | 8 | ||||
-rw-r--r-- | cras/client/cras-sys/Android.bp | 23 | ||||
-rw-r--r-- | cras/client/cras-sys/TEST_MAPPING | 8 | ||||
-rw-r--r-- | cras/client/libcras/Android.bp | 22 | ||||
-rw-r--r-- | cras/client/libcras/TEST_MAPPING | 8 |
6 files changed, 77 insertions, 5 deletions
diff --git a/audio_streams/Android.bp b/audio_streams/Android.bp index 95b816b0..cbb67437 100644 --- a/audio_streams/Android.bp +++ b/audio_streams/Android.bp @@ -1,7 +1,18 @@ +// This file is generated by cargo2android.py, added defaults. + +rust_test_host { + name: "audio_streams_tests_audio_streams", + defaults: ["crosvm_defaults"], + crate_name: "audio_streams", + srcs: ["src/audio_streams.rs"], + relative_install_path: "audio_streams_tests", + test_suites: ["general-tests"], + auto_gen_config: true, +} + rust_library_host_rlib { name: "libaudio_streams", defaults: ["crosvm_defaults"], - deny_warnings: false, crate_name: "audio_streams", srcs: ["src/audio_streams.rs"], } diff --git a/audio_streams/TEST_MAPPING b/audio_streams/TEST_MAPPING new file mode 100644 index 00000000..ce60830a --- /dev/null +++ b/audio_streams/TEST_MAPPING @@ -0,0 +1,8 @@ +{ + "presubmit": [ + { + "name": "audio_streams_tests_audio_streams", + "host": true + } + ] +} diff --git a/cras/client/cras-sys/Android.bp b/cras/client/cras-sys/Android.bp index 46ed7b8c..2a90f8f9 100644 --- a/cras/client/cras-sys/Android.bp +++ b/cras/client/cras-sys/Android.bp @@ -1,9 +1,26 @@ +// This file is generated by cargo2android.py, added defaults. + +rust_test_host { + name: "cras-sys_tests_cras_sys", + defaults: ["crosvm_defaults"], + crate_name: "cras_sys", + srcs: ["src/lib.rs"], + relative_install_path: "cras-sys_tests", + test_suites: ["general-tests"], + auto_gen_config: true, + edition: "2015", + rlibs: [ + "libdata_model", + ], +} + rust_library_host_rlib { name: "libcras_sys", defaults: ["crosvm_defaults"], - deny_warnings: false, crate_name: "cras_sys", - edition: "2015", - rlibs: ["libdata_model"], srcs: ["src/lib.rs"], + edition: "2015", + rlibs: [ + "libdata_model", + ], } diff --git a/cras/client/cras-sys/TEST_MAPPING b/cras/client/cras-sys/TEST_MAPPING new file mode 100644 index 00000000..3c63a45e --- /dev/null +++ b/cras/client/cras-sys/TEST_MAPPING @@ -0,0 +1,8 @@ +{ + "presubmit": [ + { + "name": "cras-sys_tests_cras_sys", + "host": true + } + ] +} diff --git a/cras/client/libcras/Android.bp b/cras/client/libcras/Android.bp index f3971915..33c4ddb1 100644 --- a/cras/client/libcras/Android.bp +++ b/cras/client/libcras/Android.bp @@ -1,3 +1,23 @@ +// This file is generated by cargo2android.py, added defaults. + +rust_test_host { + name: "libcras_tests_libcras", + defaults: ["crosvm_defaults"], + deny_warnings: false, + crate_name: "libcras", + srcs: ["src/libcras.rs"], + relative_install_path: "libcras_tests", + test_suites: ["general-tests"], + auto_gen_config: true, + rlibs: [ + "libaudio_streams", + "libcras_sys", + "libdata_model", + "liblibc", + "libsys_util", + ], +} + rust_library_host_rlib { name: "liblibcras", defaults: ["crosvm_defaults"], @@ -5,10 +25,10 @@ rust_library_host_rlib { crate_name: "libcras", srcs: ["src/libcras.rs"], rlibs: [ - "liblibc", "libaudio_streams", "libcras_sys", "libdata_model", + "liblibc", "libsys_util", ], } diff --git a/cras/client/libcras/TEST_MAPPING b/cras/client/libcras/TEST_MAPPING new file mode 100644 index 00000000..ecddeebe --- /dev/null +++ b/cras/client/libcras/TEST_MAPPING @@ -0,0 +1,8 @@ +{ + "presubmit": [ + { + "name": "libcras_tests_libcras", + "host": true + } + ] +} |