Skip to content

Commit 68e0321

Browse files
committed
Always load -test-/asan in tests
-test-/asan should always be available.
1 parent 337189f commit 68e0321

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tool/lib/core_assertions.rb

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,7 @@ def message msg = nil, ending = nil, &default
7474
module CoreAssertions
7575
require_relative 'envutil'
7676
require 'pp'
77-
begin
78-
require '-test-/asan'
79-
rescue LoadError
80-
end
77+
require '-test-/asan'
8178

8279
nil.pretty_inspect
8380

@@ -162,7 +159,7 @@ def assert_no_memory_leak(args, prepare, code, message=nil, limit: 2.0, rss: fal
162159
pend 'assert_no_memory_leak may consider MJIT memory usage as leak' if defined?(RubyVM::MJIT) && RubyVM::MJIT.enabled?
163160
# ASAN has the same problem - its shadow memory greatly increases memory usage
164161
# (plus asan has better ways to detect memory leaks than this assertion)
165-
pend 'assert_no_memory_leak may consider ASAN memory usage as leak' if defined?(Test::ASAN) && Test::ASAN.enabled?
162+
pend 'assert_no_memory_leak may consider ASAN memory usage as leak' if Test::ASAN.enabled?
166163

167164
require_relative 'memory_status'
168165
raise Test::Unit::PendedError, "unsupported platform" unless defined?(Memory::Status)

0 commit comments

Comments
 (0)