From d0e191a96c4911a83280835c7afdce2fbaec2bd1 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Thu, 3 Nov 2011 22:12:51 -0700 Subject: [PATCH] Make some changes to have tests run on 1.8.7 --- test/acceptance/base.rb | 1 + test/acceptance/helpers/isolated_environment.rb | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/test/acceptance/base.rb b/test/acceptance/base.rb index 3e4afffbd..7026e1239 100644 --- a/test/acceptance/base.rb +++ b/test/acceptance/base.rb @@ -1,3 +1,4 @@ +require "rubygems" require "contest" require "log4r" diff --git a/test/acceptance/helpers/isolated_environment.rb b/test/acceptance/helpers/isolated_environment.rb index 6a9edacff..2788c0848 100644 --- a/test/acceptance/helpers/isolated_environment.rb +++ b/test/acceptance/helpers/isolated_environment.rb @@ -50,10 +50,13 @@ module Acceptance def execute(command, *argN) command = replace_command(command) + # Add our hash options to the arguments list + argN << { :chdir => @workdir.to_s } + # Execute in a separate process, wait for it to complete, and # return the IO streams. @logger.info("Executing: #{command} #{argN.inspect}") - pid, stdin, stdout, stderr = popen4(@env, command, *argN, :chdir => @workdir.to_s) + pid, stdin, stdout, stderr = popen4(@env, command, *argN) _pid, status = Process.waitpid2(pid) @logger.info("Exit status: #{status.exitstatus}")