diff options
| author | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-31 02:58:55 +0000 |
|---|---|---|
| committer | mpalmer <mpalmer@980ebf18-57e1-0310-9a29-db15c13687c0> | 2006-12-31 02:58:55 +0000 |
| commit | c1035ccb7e0eb04c68b6e95b877f700d828b3be9 (patch) | |
| tree | 067ffb7ffdb70a70cff102c79514d913f1aa1c9c | |
| parent | a333539dd03e52aabb4d60a6f64570378a47081a (diff) | |
| download | puppet-c1035ccb7e0eb04c68b6e95b877f700d828b3be9.tar.gz puppet-c1035ccb7e0eb04c68b6e95b877f700d828b3be9.tar.xz puppet-c1035ccb7e0eb04c68b6e95b877f700d828b3be9.zip | |
Add system library directories directly in puppettest.rb, so you don't have to do it by hand in every single underlying directory; also change the debug check slightly so that we actually put debug stuff only when we really want it
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@1999 980ebf18-57e1-0310-9a29-db15c13687c0
| -rwxr-xr-x | test/lib/puppettest.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 2e1bde685..a2a5f33b6 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -1,3 +1,8 @@ +# Add .../test/lib +$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__))) +# Add .../lib +$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '../../lib'))) + require 'puppet' require 'test/unit' @@ -103,7 +108,7 @@ module PuppetTest @@cleaners = [] # If we're running under rake, then disable debugging and such. - if rake? and ! Puppet[:debug] + if rake? or ! Puppet[:debug] Puppet::Log.close Puppet::Log.newdestination tempfile() Puppet[:httplog] = tempfile() |