Merge pull request #2562 from adambard/upstream

Update rakefile so that it will return an exit code of 1 if there is …

1 files changed, 20 insertions, 16 deletions

diff --git a/Rakefile b/Rakefile
index b87f1aef..6a31bd72 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,19 +1,23 @@
-task default: %w[test]
-
-task :test do
-  failed = false
-  Dir["./tests/*.rb"].each do |test_file|
-    begin
-      ruby test_file
-      puts ""
-    rescue
-      puts "FAILED #{test_file}!"
-      puts ""
-      failed = true
-    end
+task default: %w[encoding yaml return_code]
+$failure = 0
+task :encoding do
+  begin
+    ruby 'tests/encoding.rb'
+  rescue Exception => msg
+    puts msg
+    $failure += 1
   end
-
-  if failed
-    exit 0
+end
+task :yaml do
+  begin
+    ruby 'tests/yaml.rb'
+  rescue Exception => msg
+    puts msg
+    $failure += 1
+  end
+end
+task :return_code do
+  if $failure != 0
+    raise "Failed #{$failure} tests!!"
   end
 end