summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--io.c7
-rw-r--r--test/ruby/test_rubyoptions.rb21
2 files changed, 1 insertions, 27 deletions
diff --git a/io.c b/io.c
index 1d4e94eb23..70d6ed0b2c 100644
--- a/io.c
+++ b/io.c
@@ -8051,12 +8051,7 @@ ruby_popen_writer(char *const *argv, rb_pid_t *pid)
int write_pair[2];
# endif
-#ifdef HAVE_PIPE2
- int result = pipe2(write_pair, O_CLOEXEC);
-#else
- int result = pipe(write_pair);
-#endif
-
+ int result = rb_cloexec_pipe(write_pair);
*pid = -1;
if (result == 0) {
# ifdef HAVE_WORKING_FORK
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 9dfca44d3b..8697092bbc 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -956,27 +956,6 @@ class TestRubyOptions < Test::Unit::TestCase
end
end
- def test_crash_report_pipe_script
- omit "only runs on Linux" unless RUBY_PLATFORM.include?("linux")
-
- Tempfile.create(["script", ".sh"]) do |script|
- Tempfile.create("crash_report") do |crash_report|
- script.write(<<~BASH)
- #!/usr/bin/env bash
-
- cat > #{crash_report.path}
- BASH
- script.close
-
- FileUtils.chmod("+x", script)
-
- assert_crash_report("| #{script.path}") do
- assert_include(File.read(crash_report.path), "[BUG] Segmentation fault at")
- end
- end
- end
- end
-
def test_DATA
Tempfile.create(["test_ruby_test_rubyoption", ".rb"]) {|t|
t.puts "puts DATA.read.inspect"