summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--process.c2
-rw-r--r--sample/test.rb7
3 files changed, 14 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bc9268ac3..9ca2a98569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Feb 25 19:35:48 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
+
+ * process.c (rb_syswait): argument order of rb_waitpid() inverted.
+
+ * sample/test.rb (system): test with scripts under the source
+ directory.
+
Mon Feb 25 13:32:13 2002 Nobuyoshi Nakada <nobu.nakada@nifty.ne.jp>
* lib/shell.rb (Shell::expand_path): relative to @cwd.
diff --git a/process.c b/process.c
index da8986207a..6b7eda6407 100644
--- a/process.c
+++ b/process.c
@@ -606,7 +606,7 @@ rb_syswait(pid)
}
do {
- i = rb_waitpid(pid, &status, 0);
+ i = rb_waitpid(pid, 0, &status);
} while (i == -1 && errno == EINTR);
if (hooked) {
diff --git a/sample/test.rb b/sample/test.rb
index 2aa598fe34..703b930f09 100644
--- a/sample/test.rb
+++ b/sample/test.rb
@@ -1006,7 +1006,12 @@ File.unlink "script_tmp" or `/bin/rm -f "script_tmp"`
File.unlink "script_tmp.bak" or `/bin/rm -f "script_tmp.bak"`
$bad = false
-for script in Dir["{lib,sample,ext}/**/*.rb"]
+if (dir = File.dirname(File.dirname(dir))) == '.'
+ dir = ""
+else
+ dir << "/"
+end
+for script in Dir["#{dir}{lib,sample,ext}/**/*.rb"]
`./miniruby -c #{script}`
unless $?
$bad = true