copy test script

git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@135 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 9 insertions, 3 deletions

diff --git a/test/blinktest.rb b/test/blinktest.rb
index d84091be5..1e96881fc 100644
--- a/test/blinktest.rb
+++ b/test/blinktest.rb
@@ -38,12 +38,13 @@ unless defined? BlinkTestSuite
     end
 
     def textfiles
-        files = Dir.entries("text").reject { |file|
+        textdir = File.join($blinkbase,"test","parser","text")
+        files = Dir.entries(File.join(textdir)).reject { |file|
             file =~ %r{\.swp}
         }.reject { |file|
             file =~ %r{\.disabled}
         }.collect { |file|
-            File.join("text",file)
+            File.join(textdir,file)
         }.find_all { |file|
             FileTest.file?(file)
         }.each { |file|
diff --git a/test/test b/test/test
index 2fad8dd5f..4b44269d5 100755
--- a/test/test
+++ b/test/test
@@ -8,8 +8,13 @@
 $:.unshift '.'
 $:.unshift '../lib'
 
-require 'blinktest.rb'
+# if we're not in the library trunk, then add that to the lib search path
+if Dir.getwd !~ %r{blink/library}
+    $:.unshift '../../../library/trunk/lib/'
+    $:.unshift '../../../library/trunk/test/'
+end
 
+require 'blinktest.rb'
 
 require 'getoptlong'