From 90df8d6b762236a7a25103dc65cf1d04e8e6ee96 Mon Sep 17 00:00:00 2001
From: Johan Holmberg <holmberg556@gmail.com>
Date: Wed, 12 Oct 2011 22:14:11 +0200
Subject: [PATCH] Add directory of CMDTEST_*.rb files to LOAD_PATH. Makes it
 easy to "require" support files in the CMDTEST_*.rb files.

---
 bin/cmdtest.rb | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/bin/cmdtest.rb b/bin/cmdtest.rb
index f37cf38..de30997 100755
--- a/bin/cmdtest.rb
+++ b/bin/cmdtest.rb
@@ -194,6 +194,10 @@ module Cmdtest
       @orig_cwd = Dir.pwd
       ENV["PATH"] = Dir.pwd + _path_separator + ENV["PATH"]
       @orig_env_path = ENV["PATH"].split(_path_separator)
+
+      # find local files "required" by testcase files
+      $LOAD_PATH.unshift(@project_dir.test_files_dir)
+
       @n_assert_failures  = 0
       @n_assert_errors    = 0
       @n_assert_successes = 0
@@ -230,9 +234,20 @@ module Cmdtest
 
     def initialize(argv)
       @argv = argv
+      @test_files = nil
     end
 
     def test_files
+      @test_files ||= _fs_test_files
+    end
+
+    def test_files_dir
+      File.dirname(test_files[0].path)
+    end
+
+    private
+
+    def _fs_test_files
       if ! @argv.empty?
         files = _expand_files_or_dirs(@argv)
         if files.empty?
@@ -255,8 +270,6 @@ module Cmdtest
       exit 1
     end
 
-    private
-
     def _test_files(files)
       files.map {|file| TestFile.new(file) }
     end