tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make Rust test harness optional for test binaries

Browse source 
Adds a test_harness field to Rust test blueprint properties. If this
field is explicitly set to false, do not build the test binary with
`--test`. This is necessary for Rust tests which cannot use the standard
test harness.

Test: atest rustBinderTest
Test: atest --host proc-macro2_tests_test
Change-Id: Icbcb54422cc716348feae56b2d71f013516b0ac0
This commit is contained in:
Stephen Crane 2020-04-25 21:40:35 -07:00 committed by Matthew Maurer
parent 89e4882d37
commit 02a623d8d3
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rust/test.go
View file

@ -41,6 +41,9 @@ type TestProperties struct {
// doesn't exist next to the Android.bp, this attribute doesn't need to be set to true
// explicitly.
Auto_gen_config *bool
// if set, build with the standard Rust test harness. Defaults to true.
Test_harness *bool
}
// A test module is a binary module with extra --test compiler flag
@ -56,6 +59,10 @@ func (test *testDecorator) nativeCoverage() bool {
return true
}
func (test *testDecorator) testHarness() bool {
return BoolDefault(test.Properties.Test_harness, true)
}
func NewRustTest(hod android.HostOrDeviceSupported) (*Module, *testDecorator) {
// Build both 32 and 64 targets for device tests.
// Cannot build both for host tests yet if the test depends on
@ -101,7 +108,9 @@ func (test *testDecorator) install(ctx ModuleContext, file android.Path) {
func (test *testDecorator) compilerFlags(ctx ModuleContext, flags Flags) Flags {
flags = test.binaryDecorator.compilerFlags(ctx, flags)
flags.RustFlags = append(flags.RustFlags, "--test")
if test.testHarness() {
flags.RustFlags = append(flags.RustFlags, "--test")
}
return flags
}