summaryrefslogtreecommitdiffhomepage
path: root/test
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2019-03-13 22:30:08 +0900
committerGitHub <[email protected]>2019-03-13 22:30:08 +0900
commit63124bf63350529f5c601d12a7c0bf16d763af78 (patch)
treebceb7adb985e9ee00aa04b6416da681214ad23c4 /test
parentad0a8888f3c7fb99304347760a746dcf64539f5e (diff)
parentc3122c887a7fb842aac78b4735a64004a9b71a20 (diff)
downloadmruby-63124bf63350529f5c601d12a7c0bf16d763af78.tar.gz
mruby-63124bf63350529f5c601d12a7c0bf16d763af78.zip
Merge pull request #4327 from shuujii/do-not-raise-an-exception-when-bintest-fail
Do not raise an exception when bintest fail
Diffstat (limited to 'test')
-rw-r--r--test/assert.rb4
-rw-r--r--test/bintest.rb2
-rw-r--r--test/report.rb4
3 files changed, 4 insertions, 6 deletions
diff --git a/test/assert.rb b/test/assert.rb
index 623ec9138..2873eece1 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -213,7 +213,7 @@ end
##
# Report the test result and print all assertions
# which were reported broken.
-def report()
+def report
t_print("\n")
$asserts.each do |msg|
@@ -232,6 +232,8 @@ def report()
t_time = Time.now - $test_start
t_print(" Time: #{t_time.round(2)} seconds\n")
end
+
+ $ko_test == 0 && $kill_test == 0
end
##
diff --git a/test/bintest.rb b/test/bintest.rb
index 2bcecaec5..ed71e57fd 100644
--- a/test/bintest.rb
+++ b/test/bintest.rb
@@ -39,4 +39,4 @@ ARGV.each do |gem|
end
end
-load 'test/report.rb'
+exit report
diff --git a/test/report.rb b/test/report.rb
deleted file mode 100644
index fb77fd0aa..000000000
--- a/test/report.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-report
-if $ko_test > 0 or $kill_test > 0
- raise "mrbtest failed (KO:#{$ko_test}, Crash:#{$kill_test})"
-end