diff options
| author | sersut <serdar@opscode.com> | 2013-10-21 16:29:15 -0700 |
|---|---|---|
| committer | sersut <serdar@opscode.com> | 2013-10-21 16:29:15 -0700 |
| commit | 202e837298882e0df52674270f93bfdc059d69d4 (patch) | |
| tree | a477ea2f8b469f43f83235f7a7518e1312bcf16f | |
| parent | ab49a996da6735b45b0790a5dc148e3b544d5a95 (diff) | |
| download | chef-202e837298882e0df52674270f93bfdc059d69d4.tar.gz | |
Execute binaries using ruby so that they can execute everywhere.
| -rw-r--r-- | spec/functional/version_spec.rb | 2 | ||||
| -rw-r--r-- | spec/integration/solo/solo_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/spec/functional/version_spec.rb b/spec/functional/version_spec.rb index a7e99d48e3..a342206161 100644 --- a/spec/functional/version_spec.rb +++ b/spec/functional/version_spec.rb @@ -28,7 +28,7 @@ describe "Chef Versions" do binaries.each do |binary| it "#{binary} version should be sane" do - shell_out!("bundle exec #{binary} -v", :cwd => chef_dir).stdout.chomp.should == "Chef: #{Chef::VERSION}" + shell_out!("ruby #{File.join("bin", binary)} -v", :cwd => chef_dir).stdout.chomp.should == "Chef: #{Chef::VERSION}" end end diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb index 0d08bf57cc..90b8273f46 100644 --- a/spec/integration/solo/solo_spec.rb +++ b/spec/integration/solo/solo_spec.rb @@ -19,7 +19,7 @@ cookbook_path "#{path_to('cookbooks')}" file_cache_path "#{path_to('config/cache')}" EOM chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..") - result = shell_out("bundle exec chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir) + result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir) result.error! end end @@ -48,14 +48,14 @@ EOM chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..") # Instantiate the first chef-solo run - s1 = Process.spawn("bundle exec chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \ + s1 = Process.spawn("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \ -l debug -L #{path_to('logs/runs.log')}", :chdir => chef_dir) # Give it some time to progress sleep 1 # Instantiate the second chef-solo run - s2 = Process.spawn("bundle exec chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \ + s2 = Process.spawn("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \ -l debug -L #{path_to('logs/runs.log')}", :chdir => chef_dir) Process.waitpid(s1) |