diff options
| -rw-r--r-- | commands/commandeer.go | 1 | ||||
| -rw-r--r-- | common/hugo/hugo.go | 10 | ||||
| -rw-r--r-- | hugolib/config.go | 2 |
3 files changed, 11 insertions, 2 deletions
diff --git a/commands/commandeer.go b/commands/commandeer.go index 06e27cf18..457f708d6 100644 --- a/commands/commandeer.go +++ b/commands/commandeer.go @@ -303,7 +303,6 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error { WorkingDir: dir, Filename: c.h.cfgFile, AbsConfigDir: c.h.getConfigDir(dir), - Environ: os.Environ(), Environment: environment, }, cfgSetAndInit, diff --git a/common/hugo/hugo.go b/common/hugo/hugo.go index 13ed47736..bf3dee26e 100644 --- a/common/hugo/hugo.go +++ b/common/hugo/hugo.go @@ -141,3 +141,13 @@ func GetDependencyList() []string { return deps } + +// IsRunningAsTest reports whether we are running as a test. +func IsRunningAsTest() bool { + for _, arg := range os.Args { + if strings.HasPrefix(arg, "-test") { + return true + } + } + return false +} diff --git a/hugolib/config.go b/hugolib/config.go index f559d7fd3..deba8abe6 100644 --- a/hugolib/config.go +++ b/hugolib/config.go @@ -55,7 +55,7 @@ func LoadConfig(d ConfigSourceDescriptor, doWithConfig ...func(cfg config.Provid d.Environment = hugo.EnvironmentProduction } - if len(d.Environ) == 0 { + if len(d.Environ) == 0 && !hugo.IsRunningAsTest() { d.Environ = os.Environ() } |