anon/cmdtest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

get 'import_file' argument relative to CMDTEST file

Browse Source 
(not current directory)
This commit is contained in:
Johan Holmberg 2012-09-06 15:21:19 +02:00
parent 7a8492e454
commit cce66576cd
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/cmdtest.rb
View File

@ -1,4 +1,4 @@
#!/usr/bin/ruby #! /usr/bin/ruby1.8
#---------------------------------------------------------------------- #----------------------------------------------------------------------
# cmdtest.rb # cmdtest.rb
#---------------------------------------------------------------------- #----------------------------------------------------------------------
@ -282,6 +282,10 @@ module Cmdtest
@orig_env_path.dup @orig_env_path.dup
end end
def test_files_dir
@project_dir.test_files_dir
end
def run(clog) def run(clog)
@orig_cwd = Dir.pwd @orig_cwd = Dir.pwd
ENV["PATH"] = Dir.pwd + _path_separator + ENV["PATH"] ENV["PATH"] = Dir.pwd + _path_separator + ENV["PATH"]
@ -322,6 +326,8 @@ module Cmdtest
class ProjectDir class ProjectDir
ORIG_CWD = Dir.pwd
def initialize(argv) def initialize(argv)
@argv = argv @argv = argv
@test_filenames = nil @test_filenames = nil
@ -332,7 +338,7 @@ module Cmdtest
end end
def test_files_dir def test_files_dir
File.dirname(test_filenames[0]) File.expand_path(File.dirname(test_filenames[0]), ORIG_CWD)
end end
private private

2
lib/cmdtest/testcase.rb
View File

@ -103,7 +103,7 @@ module Cmdtest
# the current directory at the time of the call. # the current directory at the time of the call.
def import_file(src, tgt) def import_file(src, tgt)
src_path = File.expand_path(src, ORIG_CWD) src_path = File.expand_path(src, @_runner.test_files_dir)
tgt_path = _cwd_path(tgt) tgt_path = _cwd_path(tgt)
FileUtils.mkdir_p(File.dirname(tgt_path)) FileUtils.mkdir_p(File.dirname(tgt_path))
FileUtils.cp(src_path, tgt_path) FileUtils.cp(src_path, tgt_path)