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

Merge "Clean up rust tests." am: dc455395ee am: fffbd97afa

Browse Source 
Change-Id: I38202982e963045a9c9f41fbaf91d833e2303c14
This commit is contained in:
Ivan Lozano
2020-04-24 16:14:22 +00:00
committed by Automerger Merge Worker
parent 571bb52259 fffbd97afa
commit d43697bc70
2 changed files with 25 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rust/rust_test.go
View File

@@ -215,25 +215,6 @@ func TestProcMacroDeviceDeps(t *testing.T) {
srcs: ["foo.rs"],
crate_name: "bar",
}
// Make a dummy libstd to let resolution go through
rust_library_dylib {
name: "libstd",
crate_name: "std",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_library_dylib {
name: "libterm",
crate_name: "term",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_library_dylib {
name: "libtest",
crate_name: "test",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_proc_macro {
name: "libpm",
rlibs: ["libbar"],

65
rust/testing.go
View File

@@ -21,51 +21,11 @@ import (
func GatherRequiredDepsForTest() string {
bp := `
rust_prebuilt_dylib {
name: "libarena_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libfmt_macros_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libgraphviz_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libserialize_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libstd_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libsyntax_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libsyntax_ext_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libsyntax_pos_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libterm_x86_64-unknown-linux-gnu",
srcs: [""],
host_supported: true,
}
rust_prebuilt_dylib {
name: "libtest_x86_64-unknown-linux-gnu",
srcs: [""],
@@ -81,6 +41,31 @@ func GatherRequiredDepsForTest() string {
nocrt: true,
system_shared_libs: [],
}
rust_library_dylib {
name: "libstd",
crate_name: "std",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_library_rlib {
name: "libstd.static",
crate_name: "std",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_library_dylib {
name: "libtest",
crate_name: "test",
srcs: ["foo.rs"],
no_stdlibs: true,
}
rust_library_rlib {
name: "libtest.static",
crate_name: "test",
srcs: ["foo.rs"],
no_stdlibs: true,
}
` + cc.GatherRequiredDepsForTest(android.NoOsType)
return bp
}