aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/dtrace/helper.rb10
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed37cf96d..774b4b0ce9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Nov 16 21:27:54 2015 Naohisa Goto <ngotogenome@gmail.com>
+
+ * test/dtrace/helper.rb (Dtrace::TestCase#trap_probe): dtrace buffer
+ size is set as 8m on Solaris (default 4m). [Bug #11697]
+
Mon Nov 16 18:21:52 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* object.c (rb_obj_dig): dig in nested structs too.
diff --git a/test/dtrace/helper.rb b/test/dtrace/helper.rb
index ccc708147d..f76c41b025 100644
--- a/test/dtrace/helper.rb
+++ b/test/dtrace/helper.rb
@@ -26,7 +26,15 @@ module DTrace
d_path = d.path
rb_path = rb.path
- cmd = ["dtrace", "-q", "-s", d_path, "-c", "#{EnvUtil.rubybin} -I#{INCLUDE} #{rb_path}"]
+ case RUBY_PLATFORM
+ when /solaris/i
+ # increase bufsize to 8m (default 4m on Solaris)
+ cmd = [ "dtrace", "-b", "8m" ]
+ else
+ cmd = [ "dtrace" ]
+ end
+
+ cmd.concat [ "-q", "-s", d_path, "-c", "#{EnvUtil.rubybin} -I#{INCLUDE} #{rb_path}"]
if sudo = @@sudo
[RbConfig::CONFIG["LIBPATHENV"], "RUBY", "RUBYOPT"].each do |name|
if name and val = ENV[name]