Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02a623d8 authored by Stephen Crane's avatar Stephen Crane Committed by Matthew Maurer
Browse files

Make Rust test harness optional for test binaries 

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
parent 89e4882d

rust/test.go

+10 −1
Original line number Diff line number Diff line
@@ -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)

	if test.testHarness() {

		flags.RustFlags = append(flags.RustFlags, "--test")

	}

	return flags

}