76 files changed, 10 insertions, 9 deletions
diff --git a/FOLDERS b/FOLDERS
index 38bbbda..e393ed7 100644
--- a/FOLDERS
+++ b/FOLDERS
@@ -46,7 +46,7 @@ Some files to enhance Rake, including the Autumnal Rdoc template and some script
 
 == test - Tests
 
-Test for the scanners.
+Tests for the scanners.
 
 Each language has its own subfolder and sub-suite.
 
diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake
index c29c263..18e10d7 100644
--- a/rake_tasks/test.rake
+++ b/rake_tasks/test.rake
@@ -3,12 +3,12 @@ namespace :test do
   task :demos do
     system 'ruby -wd ./demo/suite.rb'
   end
-
+  
   desc 'Test CodeRay'
   task :scanners do
-    system 'ruby -wd ./test/suite.rb'
+    system 'ruby -wd ./test/scanners/suite.rb'
   end
 end
 
-task :test => 'test:scanners'
+task :test => %w( test:scanners )
 task :demos => 'test:demos'
diff --git a/test/c/empty.in.c b/test/scanners/c/empty.in.c
index e69de29..e69de29 100644
--- a/test/c/empty.in.c
+++ b/test/scanners/c/empty.in.c
diff --git a/test/c/empty.out.raydebug b/test/scanners/c/empty.out.raydebug
index e69de29..e69de29 100644
--- a/test/c/empty.out.raydebug
+++ b/test/scanners/c/empty.out.raydebug
diff --git a/test/c/error.in.c b/test/scanners/c/error.in.c
index 9cad53e..9cad53e 100644
--- a/test/c/error.in.c
+++ b/test/scanners/c/error.in.c
diff --git a/test/c/error.out.raydebug b/test/scanners/c/error.out.raydebug
index a52becb..a52becb 100644
--- a/test/c/error.out.raydebug
+++ b/test/scanners/c/error.out.raydebug
diff --git a/test/c/error2.in.c b/test/scanners/c/error2.in.c
index 1910281..1910281 100644
--- a/test/c/error2.in.c
+++ b/test/scanners/c/error2.in.c
diff --git a/test/c/error2.out.raydebug b/test/scanners/c/error2.out.raydebug
index ccd2125..ccd2125 100644
--- a/test/c/error2.out.raydebug
+++ b/test/scanners/c/error2.out.raydebug
diff --git a/test/c/open-string.in.c b/test/scanners/c/open-string.in.c
index 9d68933..9d68933 100644
--- a/test/c/open-string.in.c
+++ b/test/scanners/c/open-string.in.c
diff --git a/test/c/open-string.out.raydebug b/test/scanners/c/open-string.out.raydebug
index a6afd22..a6afd22 100644
--- a/test/c/open-string.out.raydebug
+++ b/test/scanners/c/open-string.out.raydebug
diff --git a/test/c/strange.in.c b/test/scanners/c/strange.in.c
index 42f339d..42f339d 100644
--- a/test/c/strange.in.c
+++ b/test/scanners/c/strange.in.c
diff --git a/test/c/strange.out.raydebug b/test/scanners/c/strange.out.raydebug
index 8979a50..8979a50 100644
--- a/test/c/strange.out.raydebug
+++ b/test/scanners/c/strange.out.raydebug
diff --git a/test/c/suite.rb b/test/scanners/c/suite.rb
index fc94ad3..fc94ad3 100644
--- a/test/c/suite.rb
+++ b/test/scanners/c/suite.rb
diff --git a/test/coderay_suite.rb b/test/scanners/coderay_suite.rb
index 83d86bb..80b6119 100644
--- a/test/coderay_suite.rb
+++ b/test/scanners/coderay_suite.rb
@@ -1,5 +1,5 @@
-$mydir = File.dirname __FILE__
-$:.unshift File.join($mydir, '..', 'lib')
+$mydir = File.dirname(__FILE__)
+$:.unshift File.join($mydir, '..', '..', 'lib')
 
 require 'coderay'
 
diff --git a/test/delphi/pluto.in.pas b/test/scanners/delphi/pluto.in.pas
index b7aaad7..b7aaad7 100644
--- a/test/delphi/pluto.in.pas
+++ b/test/scanners/delphi/pluto.in.pas
diff --git a/test/delphi/pluto.out.raydebug b/test/scanners/delphi/pluto.out.raydebug
index 032e8d4..032e8d4 100644
--- a/test/delphi/pluto.out.raydebug
+++ b/test/scanners/delphi/pluto.out.raydebug
diff --git a/test/delphi/suite.rb b/test/scanners/delphi/suite.rb
index ace3fd2..ace3fd2 100644
--- a/test/delphi/suite.rb
+++ b/test/scanners/delphi/suite.rb
diff --git a/test/delphi/ytools.in.pas b/test/scanners/delphi/ytools.in.pas
index 8670459..8670459 100644
--- a/test/delphi/ytools.in.pas
+++ b/test/scanners/delphi/ytools.in.pas
diff --git a/test/delphi/ytools.out.raydebug b/test/scanners/delphi/ytools.out.raydebug
index f1621fd..f1621fd 100644
--- a/test/delphi/ytools.out.raydebug
+++ b/test/scanners/delphi/ytools.out.raydebug
diff --git a/test/html/ampersand.in.html b/test/scanners/html/ampersand.in.html
index 4bd7e7a..4bd7e7a 100644
--- a/test/html/ampersand.in.html
+++ b/test/scanners/html/ampersand.in.html
diff --git a/test/html/ampersand.out.raydebug b/test/scanners/html/ampersand.out.raydebug
index 0e0b464..0e0b464 100644
--- a/test/html/ampersand.out.raydebug
+++ b/test/scanners/html/ampersand.out.raydebug
diff --git a/test/html/suite.rb b/test/scanners/html/suite.rb
index 29c45f8..29c45f8 100644
--- a/test/html/suite.rb
+++ b/test/scanners/html/suite.rb
diff --git a/test/html/tolkien.in.html b/test/scanners/html/tolkien.in.html
index cef55da..cef55da 100644
--- a/test/html/tolkien.in.html
+++ b/test/scanners/html/tolkien.in.html
diff --git a/test/html/tolkien.out.raydebug b/test/scanners/html/tolkien.out.raydebug
index 653ddd0..653ddd0 100644
--- a/test/html/tolkien.out.raydebug
+++ b/test/scanners/html/tolkien.out.raydebug
diff --git a/test/nitro/suite.rb b/test/scanners/nitro/suite.rb
index c2f0e33..c2f0e33 100644
--- a/test/nitro/suite.rb
+++ b/test/scanners/nitro/suite.rb
diff --git a/test/nitro/tags.in.xhtml b/test/scanners/nitro/tags.in.xhtml
index 398031c..398031c 100644
--- a/test/nitro/tags.in.xhtml
+++ b/test/scanners/nitro/tags.in.xhtml
diff --git a/test/nitro/tags.out.raydebug b/test/scanners/nitro/tags.out.raydebug
index 7ce6076..7ce6076 100644
--- a/test/nitro/tags.out.raydebug
+++ b/test/scanners/nitro/tags.out.raydebug
diff --git a/test/rhtml/day.in.rhtml b/test/scanners/rhtml/day.in.rhtml
index 12ebe82..12ebe82 100644
--- a/test/rhtml/day.in.rhtml
+++ b/test/scanners/rhtml/day.in.rhtml
diff --git a/test/rhtml/day.out.raydebug b/test/scanners/rhtml/day.out.raydebug
index 7440d64..7440d64 100644
--- a/test/rhtml/day.out.raydebug
+++ b/test/scanners/rhtml/day.out.raydebug
diff --git a/test/rhtml/suite.rb b/test/scanners/rhtml/suite.rb
index aa10fff..aa10fff 100644
--- a/test/rhtml/suite.rb
+++ b/test/scanners/rhtml/suite.rb
diff --git a/test/ruby/1.in.rb b/test/scanners/ruby/1.in.rb
index ddd5106..ddd5106 100644
--- a/test/ruby/1.in.rb
+++ b/test/scanners/ruby/1.in.rb
diff --git a/test/ruby/1.out.raydebug b/test/scanners/ruby/1.out.raydebug
index 510e7c6..510e7c6 100644
--- a/test/ruby/1.out.raydebug
+++ b/test/scanners/ruby/1.out.raydebug
diff --git a/test/ruby/besetzung.in.rb b/test/scanners/ruby/besetzung.in.rb
index e226460..e226460 100644
--- a/test/ruby/besetzung.in.rb
+++ b/test/scanners/ruby/besetzung.in.rb
diff --git a/test/ruby/besetzung.out.raydebug b/test/scanners/ruby/besetzung.out.raydebug
index d65e4fc..d65e4fc 100644
--- a/test/ruby/besetzung.out.raydebug
+++ b/test/scanners/ruby/besetzung.out.raydebug
diff --git a/test/ruby/class.in.rb b/test/scanners/ruby/class.in.rb
index b8d0bca..b8d0bca 100644
--- a/test/ruby/class.in.rb
+++ b/test/scanners/ruby/class.in.rb
diff --git a/test/ruby/class.out.raydebug b/test/scanners/ruby/class.out.raydebug
index af7a63a..af7a63a 100644
--- a/test/ruby/class.out.raydebug
+++ b/test/scanners/ruby/class.out.raydebug
diff --git a/test/ruby/comment.in.rb b/test/scanners/ruby/comment.in.rb
index d0dea65..d0dea65 100644
--- a/test/ruby/comment.in.rb
+++ b/test/scanners/ruby/comment.in.rb
diff --git a/test/ruby/comment.out.raydebug b/test/scanners/ruby/comment.out.raydebug
index 0e24ae3..0e24ae3 100644
--- a/test/ruby/comment.out.raydebug
+++ b/test/scanners/ruby/comment.out.raydebug
diff --git a/test/ruby/diffed.in.rb b/test/scanners/ruby/diffed.in.rb
index a1deb0f..a1deb0f 100644
--- a/test/ruby/diffed.in.rb
+++ b/test/scanners/ruby/diffed.in.rb
diff --git a/test/ruby/diffed.out.raydebug b/test/scanners/ruby/diffed.out.raydebug
index 8881649..8881649 100644
--- a/test/ruby/diffed.out.raydebug
+++ b/test/scanners/ruby/diffed.out.raydebug
diff --git a/test/ruby/evil.in.rb b/test/scanners/ruby/evil.in.rb
index 877a586..877a586 100644
--- a/test/ruby/evil.in.rb
+++ b/test/scanners/ruby/evil.in.rb
diff --git a/test/ruby/evil.out.raydebug b/test/scanners/ruby/evil.out.raydebug
index b1e3231..b1e3231 100644
--- a/test/ruby/evil.out.raydebug
+++ b/test/scanners/ruby/evil.out.raydebug
diff --git a/test/ruby/example.in.rb b/test/scanners/ruby/example.in.rb
index 8e6d20e..8e6d20e 100644
--- a/test/ruby/example.in.rb
+++ b/test/scanners/ruby/example.in.rb
diff --git a/test/ruby/example.out.raydebug b/test/scanners/ruby/example.out.raydebug
index be68a13..be68a13 100644
--- a/test/ruby/example.out.raydebug
+++ b/test/scanners/ruby/example.out.raydebug
diff --git a/test/ruby/jarh.in.rb b/test/scanners/ruby/jarh.in.rb
index df2176e..df2176e 100644
--- a/test/ruby/jarh.in.rb
+++ b/test/scanners/ruby/jarh.in.rb
diff --git a/test/ruby/jarh.out.raydebug b/test/scanners/ruby/jarh.out.raydebug
index a1eb7fc..a1eb7fc 100644
--- a/test/ruby/jarh.out.raydebug
+++ b/test/scanners/ruby/jarh.out.raydebug
diff --git a/test/ruby/open-heredoc.in.rb b/test/scanners/ruby/open-heredoc.in.rb
index 9089080..9089080 100644
--- a/test/ruby/open-heredoc.in.rb
+++ b/test/scanners/ruby/open-heredoc.in.rb
diff --git a/test/ruby/open-heredoc.out.raydebug b/test/scanners/ruby/open-heredoc.out.raydebug
index 72fae77..72fae77 100644
--- a/test/ruby/open-heredoc.out.raydebug
+++ b/test/scanners/ruby/open-heredoc.out.raydebug
diff --git a/test/ruby/open-inline.in.rb b/test/scanners/ruby/open-inline.in.rb
index 529907e..529907e 100644
--- a/test/ruby/open-inline.in.rb
+++ b/test/scanners/ruby/open-inline.in.rb
diff --git a/test/ruby/open-inline.out.raydebug b/test/scanners/ruby/open-inline.out.raydebug
index 03af29e..03af29e 100644
--- a/test/ruby/open-inline.out.raydebug
+++ b/test/scanners/ruby/open-inline.out.raydebug
diff --git a/test/ruby/open-string.in.rb b/test/scanners/ruby/open-string.in.rb
index 897afad..897afad 100644
--- a/test/ruby/open-string.in.rb
+++ b/test/scanners/ruby/open-string.in.rb
diff --git a/test/ruby/open-string.out.raydebug b/test/scanners/ruby/open-string.out.raydebug
index e44c295..e44c295 100644
--- a/test/ruby/open-string.out.raydebug
+++ b/test/scanners/ruby/open-string.out.raydebug
diff --git a/test/ruby/pleac.in.rb b/test/scanners/ruby/pleac.in.rb
index 0f967b9..0f967b9 100644
--- a/test/ruby/pleac.in.rb
+++ b/test/scanners/ruby/pleac.in.rb
diff --git a/test/ruby/pleac.out.raydebug b/test/scanners/ruby/pleac.out.raydebug
index c6fcd8c..c6fcd8c 100644
--- a/test/ruby/pleac.out.raydebug
+++ b/test/scanners/ruby/pleac.out.raydebug
diff --git a/test/ruby/quotes.in.rb b/test/scanners/ruby/quotes.in.rb
index 8c38e1f..8c38e1f 100644
--- a/test/ruby/quotes.in.rb
+++ b/test/scanners/ruby/quotes.in.rb
diff --git a/test/ruby/quotes.out.raydebug b/test/scanners/ruby/quotes.out.raydebug
index 61fff05..61fff05 100644
--- a/test/ruby/quotes.out.raydebug
+++ b/test/scanners/ruby/quotes.out.raydebug
diff --git a/test/ruby/sidebarize.in.rb b/test/scanners/ruby/sidebarize.in.rb
index 6cb9e22..6cb9e22 100644
--- a/test/ruby/sidebarize.in.rb
+++ b/test/scanners/ruby/sidebarize.in.rb
diff --git a/test/ruby/sidebarize.out.raydebug b/test/scanners/ruby/sidebarize.out.raydebug
index fb7e255..fb7e255 100644
--- a/test/ruby/sidebarize.out.raydebug
+++ b/test/scanners/ruby/sidebarize.out.raydebug
diff --git a/test/ruby/simple.in.rb b/test/scanners/ruby/simple.in.rb
index 3f5e390..3f5e390 100644
--- a/test/ruby/simple.in.rb
+++ b/test/scanners/ruby/simple.in.rb
diff --git a/test/ruby/simple.out.raydebug b/test/scanners/ruby/simple.out.raydebug
index b423e9f..b423e9f 100644
--- a/test/ruby/simple.out.raydebug
+++ b/test/scanners/ruby/simple.out.raydebug
diff --git a/test/ruby/strange.in.rb b/test/scanners/ruby/strange.in.rb
index 8369aaa..8369aaa 100644
--- a/test/ruby/strange.in.rb
+++ b/test/scanners/ruby/strange.in.rb
diff --git a/test/ruby/strange.out.raydebug b/test/scanners/ruby/strange.out.raydebug
index b2f7d50..b2f7d50 100644
--- a/test/ruby/strange.out.raydebug
+++ b/test/scanners/ruby/strange.out.raydebug
diff --git a/test/ruby/suite.rb b/test/scanners/ruby/suite.rb
index c56b3bd..c56b3bd 100644
--- a/test/ruby/suite.rb
+++ b/test/scanners/ruby/suite.rb
diff --git a/test/ruby/test-fitter.in.rb b/test/scanners/ruby/test-fitter.in.rb
index 7d00da6..7d00da6 100644
--- a/test/ruby/test-fitter.in.rb
+++ b/test/scanners/ruby/test-fitter.in.rb
diff --git a/test/ruby/test-fitter.out.raydebug b/test/scanners/ruby/test-fitter.out.raydebug
index da35d8d..da35d8d 100644
--- a/test/ruby/test-fitter.out.raydebug
+++ b/test/scanners/ruby/test-fitter.out.raydebug
diff --git a/test/ruby/tk-calc.in.rb b/test/scanners/ruby/tk-calc.in.rb
index 76272da..76272da 100644
--- a/test/ruby/tk-calc.in.rb
+++ b/test/scanners/ruby/tk-calc.in.rb
diff --git a/test/ruby/tk-calc.out.raydebug b/test/scanners/ruby/tk-calc.out.raydebug
index 4bd4db0..4bd4db0 100644
--- a/test/ruby/tk-calc.out.raydebug
+++ b/test/scanners/ruby/tk-calc.out.raydebug
diff --git a/test/ruby/undef.in.rb b/test/scanners/ruby/undef.in.rb
index 795483d..795483d 100644
--- a/test/ruby/undef.in.rb
+++ b/test/scanners/ruby/undef.in.rb
diff --git a/test/ruby/undef.out.raydebug b/test/scanners/ruby/undef.out.raydebug
index e306858..e306858 100644
--- a/test/ruby/undef.out.raydebug
+++ b/test/scanners/ruby/undef.out.raydebug
diff --git a/test/ruby/zero.in.rb b/test/scanners/ruby/zero.in.rb
index e69de29..e69de29 100644
--- a/test/ruby/zero.in.rb
+++ b/test/scanners/ruby/zero.in.rb
diff --git a/test/ruby/zero.out.raydebug b/test/scanners/ruby/zero.out.raydebug
index e69de29..e69de29 100644
--- a/test/ruby/zero.out.raydebug
+++ b/test/scanners/ruby/zero.out.raydebug
diff --git a/test/scanners/suite.rb b/test/scanners/suite.rb
new file mode 100644
index 0000000..970492d
--- /dev/null
+++ b/test/scanners/suite.rb
@@ -0,0 +1,4 @@
+mydir = File.dirname(__FILE__)
+require File.join(mydir, 'coderay_suite')
+
+CodeRay::TestSuite.run
diff --git a/test/xml/kate.in.xml b/test/scanners/xml/kate.in.xml
index b13333b..b13333b 100644
--- a/test/xml/kate.in.xml
+++ b/test/scanners/xml/kate.in.xml
diff --git a/test/xml/kate.out.raydebug b/test/scanners/xml/kate.out.raydebug
index 01eec5a..01eec5a 100644
--- a/test/xml/kate.out.raydebug
+++ b/test/scanners/xml/kate.out.raydebug
diff --git a/test/xml/suite.rb b/test/scanners/xml/suite.rb
index b135c31..b135c31 100644
--- a/test/xml/suite.rb
+++ b/test/scanners/xml/suite.rb
diff --git a/test/suite.rb b/test/suite.rb
deleted file mode 100644
index dbc49e1..0000000
--- a/test/suite.rb
+++ /dev/null
@@ -1,3 +0,0 @@
-require 'test/coderay_suite'
-
-CodeRay::TestSuite.run