Ignore environment variables in tests
The next change will cause java tests to fail if RUN_ERROR_PRONE=true is set. Make tests more hermetic by faking an empty environment. Test: soong tests Change-Id: I01057cb0c42ec08ebed8aea87505dd01e9981915
This commit is contained in:
@@ -84,7 +84,8 @@ type config struct {
|
||||
|
||||
inMake bool
|
||||
|
||||
captureBuild bool // true for tests, saves build parameters for each module
|
||||
captureBuild bool // true for tests, saves build parameters for each module
|
||||
ignoreEnvironment bool // true for tests, returns empty from all Getenv calls
|
||||
|
||||
OncePer
|
||||
}
|
||||
@@ -173,8 +174,9 @@ func TestConfig(buildDir string) Config {
|
||||
DeviceName: stringPtr("test_device"),
|
||||
},
|
||||
|
||||
buildDir: buildDir,
|
||||
captureBuild: true,
|
||||
buildDir: buildDir,
|
||||
captureBuild: true,
|
||||
ignoreEnvironment: true,
|
||||
}
|
||||
config.deviceConfig = &deviceConfig{
|
||||
config: config,
|
||||
@@ -314,7 +316,9 @@ func (c *config) Getenv(key string) string {
|
||||
if c.envFrozen {
|
||||
panic("Cannot access new environment variables after envdeps are frozen")
|
||||
}
|
||||
val, _ = originalEnv[key]
|
||||
if !c.ignoreEnvironment {
|
||||
val, _ = originalEnv[key]
|
||||
}
|
||||
c.envDeps[key] = val
|
||||
}
|
||||
return val
|
||||
|
Reference in New Issue
Block a user