summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-03-26 17:50:33 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-03-26 17:50:33 +0900
commit67f1cfaffcbd836639b1fbfc632f57141cf5476b (patch)
tree3c3ed672e36b28ae3d112e354bdd5206efbc3f2e
parent28871b9d1f29b70e38febb1558b8bca03ef0993e (diff)
parent813ba50bfb6287508ceb57d7ce67ccd6aa4c06b6 (diff)
downloadmruby-67f1cfaffcbd836639b1fbfc632f57141cf5476b.tar.gz
mruby-67f1cfaffcbd836639b1fbfc632f57141cf5476b.zip
Merge branch 'eval_test' of https://github.com/take-cheeze/mruby into take-cheeze-eval_test
-rw-r--r--mrbgems/mruby-eval/test/eval.rb8
-rw-r--r--test/assert.rb5
2 files changed, 10 insertions, 3 deletions
diff --git a/mrbgems/mruby-eval/test/eval.rb b/mrbgems/mruby-eval/test/eval.rb
new file mode 100644
index 000000000..9c9186a0c
--- /dev/null
+++ b/mrbgems/mruby-eval/test/eval.rb
@@ -0,0 +1,8 @@
+assert('Kernel.eval') do
+ assert_equal(10) { Kernel.eval '1 * 10' }
+ assert_equal('aaa') { Kernel.eval "'a' * 3" }
+end
+
+assert('eval') do
+ assert_equal(10) { eval '1 * 10' }
+end
diff --git a/test/assert.rb b/test/assert.rb
index 1daee01c7..9ed396c24 100644
--- a/test/assert.rb
+++ b/test/assert.rb
@@ -63,10 +63,9 @@ def assert(str = 'Assertion failed', iso = '')
$asserts.push(assertion_string('Error: ', str, iso, e))
$kill_test += 1
t_print('X')
+ end
end
- ensure
- $mrbtest_assert = nil
- end
+ $mrbtest_assert = nil
t_print("\n") if $mrbtest_verbose
end