Install rust tests under nativetest(64)
* Now the installation directories match those for C/C++ tests: * The relative_install_path refers to path under nativetest(64). * Device test files are installed in data/nativetest(64). * Automatically generated configuration files and copied test binaries are still in the "testcases" directory. * Change host test configuration to run test binary files in testcases/<mutated_module_name>/<arch_type>/<stem_name> Bug: 140938178 Test: atest --include-subdirs under external/rust/crates Change-Id: I4b29afb897f4ba8749e87f79857c5b1a959bb2b0
This commit is contained in:
@@ -36,14 +36,22 @@ func (compiler *baseCompiler) setNoStdlibs() {
|
||||
compiler.Properties.No_stdlibs = proptools.BoolPtr(true)
|
||||
}
|
||||
|
||||
func NewBaseCompiler(dir, dir64 string) *baseCompiler {
|
||||
func NewBaseCompiler(dir, dir64 string, location installLocation) *baseCompiler {
|
||||
return &baseCompiler{
|
||||
Properties: BaseCompilerProperties{},
|
||||
dir: dir,
|
||||
dir64: dir64,
|
||||
location: location,
|
||||
}
|
||||
}
|
||||
|
||||
type installLocation int
|
||||
|
||||
const (
|
||||
InstallInSystem installLocation = 0
|
||||
InstallInData = iota
|
||||
)
|
||||
|
||||
type BaseCompilerProperties struct {
|
||||
// whether to pass "-D warnings" to rustc. Defaults to true.
|
||||
Deny_warnings *bool
|
||||
@@ -109,10 +117,15 @@ type baseCompiler struct {
|
||||
subDir string
|
||||
relative string
|
||||
path android.InstallPath
|
||||
location installLocation
|
||||
}
|
||||
|
||||
var _ compiler = (*baseCompiler)(nil)
|
||||
|
||||
func (compiler *baseCompiler) inData() bool {
|
||||
return compiler.location == InstallInData
|
||||
}
|
||||
|
||||
func (compiler *baseCompiler) compilerProps() []interface{} {
|
||||
return []interface{}{&compiler.Properties}
|
||||
}
|
||||
|
Reference in New Issue
Block a user