Prevent circular require warning (1.9.2)

2 files changed, 9 insertions, 8 deletions

diff --git a/test/README.txt b/test/README.txt
index e97a07e..88a4dc3 100644
--- a/test/README.txt
+++ b/test/README.txt
@@ -1,11 +1,11 @@
-2010-03-16 
+2010-03-16
 
 RUNNING TESTS
 
 Run the test suite from the net-ssh directory with the following command:
 
      ruby -Ilib -Itest -rrubygems test/test_all.rb
-     
+
 Run a single test file like this:
 
      ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
@@ -25,18 +25,19 @@ PORT FORWARDING TESTS
      ruby -Ilib -Itest -rrubygems test/manual/test_forward.rb
 
 test_forward.rb must be run separately from the test suite because
-it requires authorizing your public SSH keys on you localhost. 
+it requires authorizing your public SSH keys on you localhost.
 
 If you already have keys you can do this:
 
      cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
 
 If you don't have keys see:
-     
+
      http://kimmo.suominen.com/docs/ssh/#ssh-keygen
-         
-You should now be able to login to your localhost with out 
+
+You should now be able to login to your localhost with out
 bring prompted for a password:
 
      ssh localhost
-     
+
+-Delano
diff --git a/test/test_all.rb b/test/test_all.rb
index ca8d057..3c120d1 100644
--- a/test/test_all.rb
+++ b/test/test_all.rb
@@ -1,7 +1,7 @@
 #     $ ruby -Ilib -Itest -rrubygems test/test_all.rb
 #     $ ruby -Ilib -Itest -rrubygems test/transport/test_server_version.rb
 Dir.chdir(File.dirname(__FILE__)) do
-  test_files = Dir['**/test_*.rb']
+  test_files = Dir['**/test_*.rb']-['test_all.rb'] # prevent circular require
   test_files = test_files.reject { |f| f =~ /^manual/ }
   test_files = test_files.select { |f| f =~ Regexp.new(ENV['ONLY']) } if ENV['ONLY']
   test_files = test_files.reject { |f| f =~ Regexp.new(ENV['EXCEPT']) } if ENV['EXCEPT']