Merge "add testcases for rust output file paths" into main am: 1579a91352
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2764070 Change-Id: Ia864038ab39fb7515517e0a6029e41cd97a37dc2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sam Delmerico
Automerger Merge Worker
commit
54e057563b
2 changed files with 136 additions and 6 deletions
|
|
@ -373,17 +373,24 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
|
|||
}
|
||||
|
||||
rustcOutputFile := outputFile
|
||||
var rustcImplicitOutputs android.WritablePaths
|
||||
usesLinker := crateType == "bin" || crateType == "dylib" || crateType == "cdylib" || crateType == "proc-macro"
|
||||
if usesLinker {
|
||||
rustcOutputFile = android.PathForModuleOut(ctx, outputFile.Base()+".rsp")
|
||||
rustcImplicitOutputs = android.WritablePaths{
|
||||
android.PathForModuleOut(ctx, rustcOutputFile.Base()+".whole.a"),
|
||||
android.PathForModuleOut(ctx, rustcOutputFile.Base()+".a"),
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
Rule: rustc,
|
||||
Description: "rustc " + main.Rel(),
|
||||
Output: rustcOutputFile,
|
||||
Inputs: inputs,
|
||||
Implicits: implicits,
|
||||
Rule: rustc,
|
||||
Description: "rustc " + main.Rel(),
|
||||
Output: rustcOutputFile,
|
||||
Inputs: inputs,
|
||||
Implicits: implicits,
|
||||
ImplicitOutputs: rustcImplicitOutputs,
|
||||
Args: map[string]string{
|
||||
"rustcFlags": strings.Join(rustcFlags, " "),
|
||||
"libFlags": strings.Join(libFlags, " "),
|
||||
|
|
|
|||
|
|
@ -14,7 +14,11 @@
|
|||
|
||||
package rust
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"android/soong/android"
|
||||
"sort"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestSourceProviderCollision(t *testing.T) {
|
||||
testRustError(t, "multiple source providers generate the same filename output: bindings.rs", `
|
||||
|
|
@ -40,3 +44,122 @@ func TestSourceProviderCollision(t *testing.T) {
|
|||
}
|
||||
`)
|
||||
}
|
||||
|
||||
func TestCompilationOutputFiles(t *testing.T) {
|
||||
ctx := testRust(t, `
|
||||
rust_library {
|
||||
name: "libfizz_buzz",
|
||||
crate_name:"fizz_buzz",
|
||||
srcs: ["lib.rs"],
|
||||
}
|
||||
rust_binary {
|
||||
name: "fizz_buzz",
|
||||
crate_name:"fizz_buzz",
|
||||
srcs: ["lib.rs"],
|
||||
}
|
||||
rust_ffi {
|
||||
name: "librust_ffi",
|
||||
crate_name: "rust_ffi",
|
||||
srcs: ["lib.rs"],
|
||||
}
|
||||
`)
|
||||
testcases := []struct {
|
||||
testName string
|
||||
moduleName string
|
||||
variant string
|
||||
expectedFiles []string
|
||||
}{
|
||||
{
|
||||
testName: "dylib",
|
||||
moduleName: "libfizz_buzz",
|
||||
variant: "android_arm64_armv8-a_dylib",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.clippy",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp.a",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/libfizz_buzz.dylib.so.rsp.whole.a",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/unstripped/libfizz_buzz.dylib.so",
|
||||
"out/soong/target/product/test_device/system/lib64/libfizz_buzz.dylib.so",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_dylib/meta_lic",
|
||||
},
|
||||
},
|
||||
{
|
||||
testName: "rlib dylib-std",
|
||||
moduleName: "libfizz_buzz",
|
||||
variant: "android_arm64_armv8-a_rlib_dylib-std",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_dylib-std/libfizz_buzz.rlib",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_dylib-std/libfizz_buzz.rlib.clippy",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_dylib-std/meta_lic",
|
||||
},
|
||||
},
|
||||
{
|
||||
testName: "rlib rlib-std",
|
||||
moduleName: "libfizz_buzz",
|
||||
variant: "android_arm64_armv8-a_rlib_rlib-std",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_rlib-std/libfizz_buzz.rlib",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_rlib-std/libfizz_buzz.rlib.clippy",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_rlib-std/meta_lic",
|
||||
"out/soong/.intermediates/libfizz_buzz/android_arm64_armv8-a_rlib_rlib-std/rustdoc.timestamp",
|
||||
},
|
||||
},
|
||||
{
|
||||
testName: "rust_binary",
|
||||
moduleName: "fizz_buzz",
|
||||
variant: "android_arm64_armv8-a",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.clippy",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp.a",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/fizz_buzz.rsp.whole.a",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/unstripped/fizz_buzz",
|
||||
"out/soong/target/product/test_device/system/bin/fizz_buzz",
|
||||
"out/soong/.intermediates/fizz_buzz/android_arm64_armv8-a/meta_lic",
|
||||
},
|
||||
},
|
||||
{
|
||||
testName: "rust_ffi static",
|
||||
moduleName: "librust_ffi",
|
||||
variant: "android_arm64_armv8-a_static",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_static/librust_ffi.a",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_static/librust_ffi.a.clippy",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_static/meta_lic",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_static/rustdoc.timestamp",
|
||||
},
|
||||
},
|
||||
{
|
||||
testName: "rust_ffi shared",
|
||||
moduleName: "librust_ffi",
|
||||
variant: "android_arm64_armv8-a_shared",
|
||||
expectedFiles: []string{
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.clippy",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp.a",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/librust_ffi.so.rsp.whole.a",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/unstripped/librust_ffi.so",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/unstripped/librust_ffi.so.toc",
|
||||
"out/soong/.intermediates/librust_ffi/android_arm64_armv8-a_shared/meta_lic",
|
||||
"out/soong/target/product/test_device/system/lib64/librust_ffi.so",
|
||||
},
|
||||
},
|
||||
}
|
||||
for _, tc := range testcases {
|
||||
t.Run(tc.testName, func(t *testing.T) {
|
||||
modOutputs := ctx.ModuleForTests(tc.moduleName, tc.variant).AllOutputs()
|
||||
sort.Strings(tc.expectedFiles)
|
||||
sort.Strings(modOutputs)
|
||||
android.AssertStringPathsRelativeToTopEquals(
|
||||
t,
|
||||
"incorrect outputs from rust module",
|
||||
ctx.Config(),
|
||||
tc.expectedFiles,
|
||||
modOutputs,
|
||||
)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue