Skip to content
Snippets Groups Projects
Commit 5b87f8f8 authored by Volker Hilsheimer's avatar Volker Hilsheimer
Browse files

Make box parameter optional for expanding variable

parent 1fee7151
No related branches found
No related tags found
No related merge requests found
...@@ -263,7 +263,7 @@ def expand_env(value, box) ...@@ -263,7 +263,7 @@ def expand_env(value, box)
end end
end end
value = value.sub("$#{env_name}", env_val) value = value.sub("$#{env_name}", env_val)
if box.vm.guest == :windows if !box.nil? && box.vm.guest == :windows
value = value.gsub("/", "\\\\") value = value.gsub("/", "\\\\")
end end
end end
......
...@@ -90,30 +90,29 @@ class Tester ...@@ -90,30 +90,29 @@ class Tester
end end
end end
def test_expand_env() def test_expand_env()
user = ENV["USER"]
test_data = { test_data = {
"plain" => [:windows, "foo", "foo"], "plain" => [:windows, "foo", "foo"],
"$home_win" => [:windows, "$HOME", "C:\\Users\\host"], "$home_win" => [:windows, "$HOME", "C:\\Users\\host"],
"$home_nix" => [:linux, "$HOME", "/home/host"], "$home_nix" => [:linux, "$HOME", "/home/host"],
"$home_mac" => [:darwin, "$HOME", "/Users/host"] "$home_mac" => [:darwin, "$HOME", "/Users/host"],
"$user" => [nil, "$USER", user],
"$user$user" => [nil, "$USER$USER", "#{user}#{user}"]
} }
test_data.each do |name, data| test_data.each do |name, data|
@data_count += 1 @data_count += 1
guest = data[0] guest = data[0]
input = data[1] input = data[1]
output = data[2] output = data[2]
box = Box.new(guest) box = Box.new(guest) unless guest.nil?
result = expand_env(input, box) result = expand_env(input, box)
if result != output if result != output
puts "Fail! for '#{name}', produced '#{result}', expected '#{output}'" puts "Fail! for '#{name}', produced '#{result}', expected '#{output}'"
@error_count += 1 @error_count += 1
end end
end end
box = Box.new(:linux)
test_data = {
"$HOME" => "C:\\Users\\host"
}
end end
def errors() def errors()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment