StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow disabling the named test directory for cc_test

Browse Source 
am: 3340d6091c

Change-Id: I28da1f2dcd16d819b2d305e956ebb6a1e7b38603
This commit is contained in:
Dan Willemsen
2016-12-28 00:23:04 +00:00
committed by android-build-merger
parent e22658812b 3340d6091c
commit 05c9309409
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cc/test.go
View File

@@ -33,6 +33,11 @@ type TestBinaryProperties struct {
// Create a separate binary for each source file. Useful when there is // Create a separate binary for each source file. Useful when there is
// global state that can not be torn down and reset between each test suite. // global state that can not be torn down and reset between each test suite.
Test_per_src *bool Test_per_src *bool
// Disables the creation of a test-specific directory when used with
// relative_install_path. Useful if several tests need to be in the same
// directory, but test_per_src doesn't work.
No_named_install_directory *bool
} }
func init() { func init() {
@@ -214,7 +219,13 @@ func (test *testBinary) linkerFlags(ctx ModuleContext, flags Flags) Flags {
func (test *testBinary) install(ctx ModuleContext, file android.Path) { func (test *testBinary) install(ctx ModuleContext, file android.Path) {
test.binaryDecorator.baseInstaller.dir = "nativetest" test.binaryDecorator.baseInstaller.dir = "nativetest"
test.binaryDecorator.baseInstaller.dir64 = "nativetest64" test.binaryDecorator.baseInstaller.dir64 = "nativetest64"
test.binaryDecorator.baseInstaller.relative = ctx.ModuleName()
if !Bool(test.Properties.No_named_install_directory) {
test.binaryDecorator.baseInstaller.relative = ctx.ModuleName()
} else if test.binaryDecorator.baseInstaller.Properties.Relative_install_path == "" {
ctx.PropertyErrorf("no_named_install_directory", "Module install directory may only be disabled if relative_install_path is set")
}
test.binaryDecorator.baseInstaller.install(ctx, file) test.binaryDecorator.baseInstaller.install(ctx, file)
} }