From bd80fc53159f4ada3549b6f85209af13be375095 Mon Sep 17 00:00:00 2001
From: normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 5 Jun 2018 21:19:45 +0000
Subject: test/dtrace: enable Tracepoint for function calls

Since [Feature #14104], "trace" instructions are no
longer emitted by default, so we must enable them explicitly
for function tracing to work.

[ruby-core:85965]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63580 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/dtrace/test_function_entry.rb     | 5 +++--
 test/dtrace/test_singleton_function.rb | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/dtrace/test_function_entry.rb b/test/dtrace/test_function_entry.rb
index fc07ccc455..2fac424fe4 100644
--- a/test/dtrace/test_function_entry.rb
+++ b/test/dtrace/test_function_entry.rb
@@ -18,7 +18,7 @@ ruby$target:::method-entry
 	}
 
 	assert_equal 10, foo_calls.length
-	line = '2'
+	line = '3'
 	foo_calls.each { |f| assert_equal line, f[3] }
 	foo_calls.each { |f| assert_equal rb_file, f[2] }
       }
@@ -39,7 +39,7 @@ ruby$target:::method-return
 	}
 
 	assert_equal 10, foo_calls.length
-	line = '2'
+	line = '3'
 	foo_calls.each { |f| assert_equal line, f[3] }
 	foo_calls.each { |f| assert_equal rb_file, f[2] }
       }
@@ -77,6 +77,7 @@ ruby$target:::method-return
     private
     def ruby_program
       <<-eoruby
+      TracePoint.new{}.enable
       class Foo
 	def foo; end
       end
diff --git a/test/dtrace/test_singleton_function.rb b/test/dtrace/test_singleton_function.rb
index 3698a02c93..a896b91975 100644
--- a/test/dtrace/test_singleton_function.rb
+++ b/test/dtrace/test_singleton_function.rb
@@ -18,7 +18,7 @@ ruby$target:::method-entry
 	}
 
 	assert_equal 10, foo_calls.length
-	line = '2'
+	line = '3'
 	foo_calls.each { |f| assert_equal line, f[3] }
 	foo_calls.each { |f| assert_equal rb_file, f[2] }
       }
@@ -38,7 +38,7 @@ ruby$target:::method-return
 	}
 
 	assert_equal 10, foo_calls.length
-	line = '2'
+	line = '3'
 	foo_calls.each { |f| assert_equal line, f[3] }
 	foo_calls.each { |f| assert_equal rb_file, f[2] }
       }
@@ -46,6 +46,7 @@ ruby$target:::method-return
 
     def ruby_program
       <<-eoruby
+      TracePoint.new{}.enable
       class Foo
 	def self.foo; end
       end
-- 
cgit v1.2.3