From 6b8c10d1fba3a9164f25a5f8e43a28f952e33fee Mon Sep 17 00:00:00 2001 From: Dave Collins Date: Fri, 15 Nov 2013 14:42:53 -0600 Subject: [PATCH] Don't load default config file in regtest mode. The regression test mode is special and therefore most likely will not want to use the same settings that are in the configuration file. The -C option can still be used to specify a config file in regression test mode if desired. --- config.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/config.go b/config.go index 6752ce16..4a4e8aed 100644 --- a/config.go +++ b/config.go @@ -225,14 +225,16 @@ func loadConfig() (*config, []string, error) { // Load additional config from file. parser := flags.NewParser(&cfg, flags.Default) - err := parser.ParseIniFile(preCfg.ConfigFile) - if err != nil { - if _, ok := err.(*os.PathError); !ok { - fmt.Fprintln(os.Stderr, err) - parser.WriteHelp(os.Stderr) - return nil, nil, err + if !preCfg.RegressionTest || preCfg.ConfigFile != defaultConfigFile { + err := parser.ParseIniFile(preCfg.ConfigFile) + if err != nil { + if _, ok := err.(*os.PathError); !ok { + fmt.Fprintln(os.Stderr, err) + parser.WriteHelp(os.Stderr) + return nil, nil, err + } + log.Warnf("%v", err) } - log.Warnf("%v", err) } // Don't add peers from the config file when in regression test mode.