Make some changes to have tests run on 1.8.7
This commit is contained in:
parent
cab1e4e49b
commit
d0e191a96c
|
@ -1,3 +1,4 @@
|
||||||
|
require "rubygems"
|
||||||
require "contest"
|
require "contest"
|
||||||
require "log4r"
|
require "log4r"
|
||||||
|
|
||||||
|
|
|
@ -50,10 +50,13 @@ module Acceptance
|
||||||
def execute(command, *argN)
|
def execute(command, *argN)
|
||||||
command = replace_command(command)
|
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
|
# Execute in a separate process, wait for it to complete, and
|
||||||
# return the IO streams.
|
# return the IO streams.
|
||||||
@logger.info("Executing: #{command} #{argN.inspect}")
|
@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)
|
_pid, status = Process.waitpid2(pid)
|
||||||
@logger.info("Exit status: #{status.exitstatus}")
|
@logger.info("Exit status: #{status.exitstatus}")
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue