From 865dffe9bf0e5d53d727cf4f079ae6f2648a3364 Mon Sep 17 00:00:00 2001 From: Luke Kanies Date: Fri, 22 Apr 2005 23:38:49 +0000 Subject: dealing with having moved the examples to the language area git-svn-id: https://reductivelabs.com/svn/puppet/library/trunk@219 980ebf18-57e1-0310-9a29-db15c13687c0 --- test/blinktest.rb | 4 ++-- test/client/tc_client.rb | 2 +- test/other/tc_fact.rb | 2 +- test/other/tc_function.rb | 2 +- test/other/tc_selector.rb | 2 +- test/test | 2 +- test/types/tc_basic.rb | 2 +- test/types/tc_file.rb | 2 +- test/types/tc_filetype.rb | 2 +- test/types/tc_package.rb | 2 +- test/types/tc_service.rb | 2 +- test/types/tc_symlink.rb | 2 +- test/types/tc_type.rb | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/test/blinktest.rb b/test/blinktest.rb index f44167486..99e0e207a 100644 --- a/test/blinktest.rb +++ b/test/blinktest.rb @@ -37,8 +37,8 @@ unless defined? BlinkTestSuite end def textfiles - textdir = File.join($blinkbase,"test","parser","text") - files = Dir.entries(File.join(textdir)).reject { |file| + textdir = File.join($blinkbase,"examples","code") + files = Dir.entries(textdir).reject { |file| file =~ %r{\.swp} }.reject { |file| file =~ %r{\.disabled} diff --git a/test/client/tc_client.rb b/test/client/tc_client.rb index 21d308e04..54da3dc6a 100644 --- a/test/client/tc_client.rb +++ b/test/client/tc_client.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk/" end require 'blink' diff --git a/test/other/tc_fact.rb b/test/other/tc_fact.rb index c1aaafa72..439f3312d 100644 --- a/test/other/tc_fact.rb +++ b/test/other/tc_fact.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk/" end require 'blink/fact' diff --git a/test/other/tc_function.rb b/test/other/tc_function.rb index 998fac7ae..22539cd0e 100644 --- a/test/other/tc_function.rb +++ b/test/other/tc_function.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink/function' diff --git a/test/other/tc_selector.rb b/test/other/tc_selector.rb index 26cf6165e..cd786fd1a 100644 --- a/test/other/tc_selector.rb +++ b/test/other/tc_selector.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink/selector' diff --git a/test/test b/test/test index 4b44269d5..14301cf4c 100755 --- a/test/test +++ b/test/test @@ -35,7 +35,7 @@ result.each { |opt,arg| end } -$blinkbase = ".." +$blinkbase = "../../../language/trunk" suites = nil diff --git a/test/types/tc_basic.rb b/test/types/tc_basic.rb index 6d453d188..fae4168ce 100644 --- a/test/types/tc_basic.rb +++ b/test/types/tc_basic.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink' diff --git a/test/types/tc_file.rb b/test/types/tc_file.rb index 5731bfec0..9be428eb9 100644 --- a/test/types/tc_file.rb +++ b/test/types/tc_file.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink' diff --git a/test/types/tc_filetype.rb b/test/types/tc_filetype.rb index 255844b40..62de3e457 100644 --- a/test/types/tc_filetype.rb +++ b/test/types/tc_filetype.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink' diff --git a/test/types/tc_package.rb b/test/types/tc_package.rb index d78dca75d..2b779454a 100644 --- a/test/types/tc_package.rb +++ b/test/types/tc_package.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink/type/package' diff --git a/test/types/tc_service.rb b/test/types/tc_service.rb index ad85f615a..4ea4faee1 100644 --- a/test/types/tc_service.rb +++ b/test/types/tc_service.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink' diff --git a/test/types/tc_symlink.rb b/test/types/tc_symlink.rb index 177f523a5..6991f532b 100644 --- a/test/types/tc_symlink.rb +++ b/test/types/tc_symlink.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end require 'blink' diff --git a/test/types/tc_type.rb b/test/types/tc_type.rb index e3d1b9dce..9cfb1f421 100644 --- a/test/types/tc_type.rb +++ b/test/types/tc_type.rb @@ -1,7 +1,7 @@ if __FILE__ == $0 $:.unshift '..' $:.unshift '../../lib' - $blinkbase = "../.." + $blinkbase = "../../../../language/trunk" end # $Id$ -- cgit