Oops, that last commit seems to have broken the rakefile. Works again.

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

3 files changed, 27 insertions, 18 deletions

diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index bc6643840..cda91e77b 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -163,11 +163,7 @@ module PuppetTest
 
         # If we're running under rake, then disable debugging and such.
         #if rake? or ! Puppet[:debug]
-        if rake? or ! defined?($puppet_debug)
-            Puppet::Log.close
-            Puppet::Log.newdestination tempfile()
-            Puppet[:httplog] = tempfile()
-        else    
+        if defined?($puppet_debug) or ! rake?
             if textmate?
                 Puppet[:color] = false
             end
@@ -176,6 +172,10 @@ module PuppetTest
             #$VERBOSE = 1
             Puppet.info @method_name
             Puppet[:trace] = true
+        else    
+            Puppet::Log.close
+            Puppet::Log.newdestination tempfile()
+            Puppet[:httplog] = tempfile()
         end
 
         Puppet[:ignoreschedules] = true
diff --git a/test/lib/rake/puppet_test_loader.rb b/test/lib/rake/puppet_test_loader.rb
index 2bc03aa07..83531c677 100644
--- a/test/lib/rake/puppet_test_loader.rb
+++ b/test/lib/rake/puppet_test_loader.rb
@@ -1,14 +1,13 @@
 
 require 'test/unit/autorunner'
 require 'getoptlong'
+require 'puppettest'
 
-result = GetoptLong.new(
-    [ "--debug",    "-d",           GetoptLong::NO_ARGUMENT ],
-    [ "-n",                         GetoptLong::REQUIRED_ARGUMENT ],
-    [ "--help",     "-h",           GetoptLong::NO_ARGUMENT ]
-)
+args = PuppetTest.munge_argv
 
-ARGV.each { |f| require f unless f =~ /^-/  }
+p $puppet_debug
+
+args.each { |f| require f unless f =~ /^-/  }
 
 runner = Test::Unit::AutoRunner.new(false)
 runner.process_args
diff --git a/test/test b/test/test
index 9fb856273..c9c92d33d 100755
--- a/test/test
+++ b/test/test
@@ -34,6 +34,8 @@ unless args.length != 0
     end
 end
 
+
+exit
 files = []
 
 args.each do |test|
@@ -42,13 +44,21 @@ args.each do |test|
     end
 end
 
-# Now load all of our files.
-files.each do |file|
-    load file unless file =~ /^-/
-end
+args = %w{ruby}
+args << "-Ilib:../lib"
+args += ARGV
+args << "lib/rake/puppet_test_loader.rb"
+args += files
+p args
+system(*files)
 
-runner = Test::Unit::AutoRunner.new(false) 
-runner.process_args
-runner.run
+## Now load all of our files.
+#files.each do |file|
+#    load file unless file =~ /^-/
+#end
+#
+#runner = Test::Unit::AutoRunner.new(false) 
+#runner.process_args
+#runner.run
 
 # $Id$