summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-14 03:20:39 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-14 03:20:39 +0000
commitdca1c7577bc6595089c38dd2a9bd870e601cb9ed (patch)
treee5d976116dfdf858d28e82aba4fd480cf8559524
parentfc30f37227be75721633941fce758aaca651cf29 (diff)
downloadruby-dca1c7577bc6595089c38dd2a9bd870e601cb9ed.tar.gz
ruby-dca1c7577bc6595089c38dd2a9bd870e601cb9ed.tar.xz
ruby-dca1c7577bc6595089c38dd2a9bd870e601cb9ed.zip
* test/gdbm/test_gdbm.rb: specify pid for the argument of
Process.wait. workaround for Cygwin. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/gdbm/test_gdbm.rb12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2eb4ed5d9..d10a65883 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Dec 14 12:11:46 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * test/gdbm/test_gdbm.rb: specify pid for the argument of
+ Process.wait. workaround for Cygwin.
+
Wed Dec 14 12:01:26 2005 Tanaka Akira <akr@m17n.org>
* marshal.c (r_object0): fix a GC problem for reading a bignum on
diff --git a/test/gdbm/test_gdbm.rb b/test/gdbm/test_gdbm.rb
index a2a3fc45f..034f62085 100644
--- a/test/gdbm/test_gdbm.rb
+++ b/test/gdbm/test_gdbm.rb
@@ -118,7 +118,7 @@ if defined? GDBM
end
def test_s_open_lock
return unless have_fork? # snip this test
- fork() {
+ pid = fork() {
assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644))
sleep 2
}
@@ -132,7 +132,7 @@ if defined? GDBM
end
}
ensure
- Process.wait
+ Process.wait pid
end
end
@@ -158,7 +158,7 @@ if defined? GDBM
end
return unless have_fork? # snip this test
- fork() {
+ pid = fork() {
assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644,
GDBM::NOLOCK))
sleep 2
@@ -170,13 +170,13 @@ if defined? GDBM
assert_instance_of(GDBM, gdbm2 = GDBM.open("tmptest_gdbm", 0644))
}
ensure
- Process.wait
+ Process.wait pid
gdbm2.close if gdbm2
end
p Dir.glob("tmptest_gdbm*") if $DEBUG
- fork() {
+ pid = Process.fork() {
assert_instance_of(GDBM, gdbm = GDBM.open("tmptest_gdbm", 0644))
sleep 2
}
@@ -189,7 +189,7 @@ if defined? GDBM
GDBM::NOLOCK))
}
ensure
- Process.wait
+ Process.wait pid
gdbm2.close if gdbm2
end
end