Rakefile in processing-0.5.30 vs Rakefile in processing-0.5.31

@@ -12,28 +12,36 @@
 require 'rays/extension'
 require 'reflex/extension'
 require 'processing/extension'
 
 
-EXTENSIONS    = [Xot, Rucy, Rays, Reflex, Processing]
-DRAW_TESTS    = Dir.glob('test/draw/test_*.rb')
-TESTS_EXCLUDE = DRAW_TESTS
+def test_with_p5()
+  ENV['TEST_WITH_P5'] = '1'
+end
 
+EXTENSIONS = [Xot, Rucy, Rays, Reflex, Processing]
+
 ENV['RDOC'] = 'yardoc --no-private'
 
+#test_with_p5 if ci?
+
 default_tasks
 use_bundler
 test_ruby_extension
 generate_documents
 build_ruby_gem
 
 task :clean => 'test:clean'
 
 namespace :test do
   task :clean do
-    sh %( rm -rf test/draw/p5rb )
+    sh %( rm -rf test/.png/*.png )
   end
 
-  task :draw do
-    sh %( ruby #{DRAW_TESTS.join ' '} )
+  task :with_p5 do
+    test_with_p5
+  end
+
+  ::Rake::TestTask.new :draw do |t|
+    t.test_files = FileList['test/test_*.rb']
   end
 end