summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-05-13 09:14:11 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-05-13 09:14:11 +0900
commitb584eaf64bd3936bb38733d03230c090a9c4d6a8 (patch)
treef1b0c5503e6ed4c98df70d79501383f9c995eabd
parentb4657182da44febeccd5f22af636bceda776122f (diff)
parent53fa535d2bcf5ba0ccaf9687ef6efabbd1185341 (diff)
downloadmruby-b584eaf64bd3936bb38733d03230c090a9c4d6a8.tar.gz
mruby-b584eaf64bd3936bb38733d03230c090a9c4d6a8.zip
Merge branch 'master' of github.com:mruby/mruby
-rw-r--r--tasks/mrbgems_test.rake2
-rw-r--r--test/t/hash.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/tasks/mrbgems_test.rake b/tasks/mrbgems_test.rake
index d5e115f86..d06b7a24c 100644
--- a/tasks/mrbgems_test.rake
+++ b/tasks/mrbgems_test.rake
@@ -117,7 +117,7 @@ MRuby.each_target do
no_mrb_open_test_lib = no_mrb_open_test.ext(exts.object)
file no_mrb_open_test_lib => "#{no_mrb_open_test}.c"
- file "#{no_mrb_open_test}.c" => no_mrb_open_test_rbfiles do |t|
+ file "#{no_mrb_open_test}.c" => no_mrb_open_test_rbfiles + [MRUBY_CONFIG] do |t|
open(t.name, 'w') do |f|
f.puts %Q[/*]
f.puts %Q[ * This file contains a test code for following gems:]
diff --git a/test/t/hash.rb b/test/t/hash.rb
index 0e035a3a7..0d8d137c4 100644
--- a/test/t/hash.rb
+++ b/test/t/hash.rb
@@ -40,7 +40,7 @@ assert('Hash#dup') do
a = { 'a' => 1 }
b = a.dup
a['a'] = 2
- assert_equal(b, {'a' => 1})
+ assert_equal({'a' => 1}, b)
end
assert('Hash#default', '15.2.13.4.5') do