Commit a17cbb6e authored by intrigeri's avatar intrigeri
Browse files

Merge remote-tracking branch 'origin/bugfix/9257-allow-empty-local-configs' into stable

Fix-committed: #9257
parents 55c8fee1 932ee688
......@@ -11,11 +11,14 @@ LOCAL_CONFIGS_DIR = "#{Dir.pwd}/features/config/local.d"
assert File.exists?(DEFAULTS_CONFIG_FILE)
$config = YAML.load(File.read(DEFAULTS_CONFIG_FILE))
Dir.glob("#{LOCAL_CONFIGS_DIR}/*.yml").sort.each do |config|
$config.merge!(YAML.load(File.read(config)))
end
if File.exists?(LOCAL_CONFIG_FILE)
$config.merge!(YAML.load(File.read(LOCAL_CONFIG_FILE)))
config_files = Dir.glob("#{LOCAL_CONFIGS_DIR}/*.yml").sort
config_files.insert(0, LOCAL_CONFIG_FILE) if File.exists?(LOCAL_CONFIG_FILE)
config_files.each do |config_file|
yaml_struct = YAML.load(File.read(config_file)) || Hash.new
if not(yaml_struct.instance_of?(Hash))
raise "Local configuration file '#{config_file}' is malformed"
end
$config.merge!(yaml_struct)
end
# Options passed to the `run_test_suite` script will always take
# precedence. The way we import these keys is only safe for values
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment