rust: Add data_libs and data_bins to rust_test
Allows defining data binaries and libraries that should be installed alongside a rust_test module, similar to cc_test. This refactors cc_test as well so it can define rust_ffi_shared and rust_binary modules as data. Bug: 171710847 Test: New Soong tests pass. Test: Example module installs data appropriately. Change-Id: I0b56098fb475ec54f9b7a761220d260fe68cbee1
This commit is contained in:
@@ -74,3 +74,129 @@ func TestRustTestLinkage(t *testing.T) {
|
||||
t.Errorf("Device rust_test module 'my_test' does not link libstd as an rlib")
|
||||
}
|
||||
}
|
||||
|
||||
func TestDataLibs(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "test_lib",
|
||||
srcs: ["test_lib.cpp"],
|
||||
}
|
||||
|
||||
rust_binary {
|
||||
name: "rusty",
|
||||
srcs: ["foo.rs"],
|
||||
compile_multilib: "both",
|
||||
}
|
||||
|
||||
rust_ffi {
|
||||
name: "librust_test_lib",
|
||||
crate_name: "rust_test_lib",
|
||||
srcs: ["test_lib.rs"],
|
||||
relative_install_path: "foo/bar/baz",
|
||||
compile_multilib: "64",
|
||||
}
|
||||
|
||||
rust_test {
|
||||
name: "main_test",
|
||||
srcs: ["foo.rs"],
|
||||
data_libs: ["test_lib"],
|
||||
data_bins: ["rusty"],
|
||||
}
|
||||
`
|
||||
|
||||
ctx := testRust(t, bp)
|
||||
|
||||
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
|
||||
testBinary := module.(*Module).compiler.(*testDecorator)
|
||||
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
|
||||
if err != nil {
|
||||
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
|
||||
}
|
||||
if len(outputFiles) != 1 {
|
||||
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
|
||||
}
|
||||
if len(testBinary.dataPaths()) != 2 {
|
||||
t.Fatalf("expected exactly two test data files. test data files: [%s]", testBinary.dataPaths())
|
||||
}
|
||||
|
||||
outputPath := outputFiles[0].String()
|
||||
dataLibraryPath := testBinary.dataPaths()[0].SrcPath.String()
|
||||
dataBinaryPath := testBinary.dataPaths()[1].SrcPath.String()
|
||||
|
||||
if !strings.HasSuffix(outputPath, "/main_test") {
|
||||
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
||||
}
|
||||
if !strings.HasSuffix(dataLibraryPath, "/test_lib.so") {
|
||||
t.Errorf("expected test data file to be 'test_lib.so', but was '%s'", dataLibraryPath)
|
||||
}
|
||||
if !strings.HasSuffix(dataBinaryPath, "/rusty") {
|
||||
t.Errorf("expected test data file to be 'test_lib.so', but was '%s'", dataBinaryPath)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDataLibsRelativeInstallPath(t *testing.T) {
|
||||
bp := `
|
||||
cc_library {
|
||||
name: "test_lib",
|
||||
srcs: ["test_lib.cpp"],
|
||||
relative_install_path: "foo/bar/baz",
|
||||
compile_multilib: "64",
|
||||
}
|
||||
|
||||
rust_ffi {
|
||||
name: "librust_test_lib",
|
||||
crate_name: "rust_test_lib",
|
||||
srcs: ["test_lib.rs"],
|
||||
relative_install_path: "foo/bar/baz",
|
||||
compile_multilib: "64",
|
||||
}
|
||||
|
||||
rust_binary {
|
||||
name: "rusty",
|
||||
srcs: ["foo.rs"],
|
||||
relative_install_path: "foo/bar/baz",
|
||||
compile_multilib: "64",
|
||||
}
|
||||
|
||||
rust_test {
|
||||
name: "main_test",
|
||||
srcs: ["foo.rs"],
|
||||
data_libs: ["test_lib", "librust_test_lib"],
|
||||
data_bins: ["rusty"],
|
||||
compile_multilib: "64",
|
||||
}
|
||||
`
|
||||
|
||||
ctx := testRust(t, bp)
|
||||
module := ctx.ModuleForTests("main_test", "android_arm64_armv8-a").Module()
|
||||
testBinary := module.(*Module).compiler.(*testDecorator)
|
||||
outputFiles, err := module.(android.OutputFileProducer).OutputFiles("")
|
||||
if err != nil {
|
||||
t.Fatalf("Expected rust_test to produce output files, error: %s", err)
|
||||
}
|
||||
if len(outputFiles) != 1 {
|
||||
t.Fatalf("expected exactly one output file. output files: [%s]", outputFiles)
|
||||
}
|
||||
if len(testBinary.dataPaths()) != 3 {
|
||||
t.Fatalf("expected exactly two test data files. test data files: [%s]", testBinary.dataPaths())
|
||||
}
|
||||
|
||||
outputPath := outputFiles[0].String()
|
||||
|
||||
if !strings.HasSuffix(outputPath, "/main_test") {
|
||||
t.Errorf("expected test output file to be 'main_test', but was '%s'", outputPath)
|
||||
}
|
||||
entries := android.AndroidMkEntriesForTest(t, ctx, module)[0]
|
||||
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][0], ":test_lib.so:foo/bar/baz") {
|
||||
t.Errorf("expected LOCAL_TEST_DATA to end with `:test_lib.so:foo/bar/baz`,"+
|
||||
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][0])
|
||||
}
|
||||
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][1], ":librust_test_lib.so:foo/bar/baz") {
|
||||
t.Errorf("expected LOCAL_TEST_DATA to end with `:librust_test_lib.so:foo/bar/baz`,"+
|
||||
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][1])
|
||||
}
|
||||
if !strings.HasSuffix(entries.EntryMap["LOCAL_TEST_DATA"][2], ":rusty:foo/bar/baz") {
|
||||
t.Errorf("expected LOCAL_TEST_DATA to end with `:rusty:foo/bar/baz`,"+
|
||||
" but was '%s'", entries.EntryMap["LOCAL_TEST_DATA"][2])
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user