aboutsummaryrefslogtreecommitdiff
path: root/lib/std/testing.zig
diff options
context:
space:
mode:
authorBenjamin Feng <benjamin.feng@glassdoor.com>2020-01-29 21:22:01 -0600
committerBenjamin Feng <benjamin.feng@glassdoor.com>2020-01-29 22:22:00 -0600
commitb077f3ab7d55374d2770336db236ecd7b18238a8 (patch)
treed1a9453a3faf5e019afd75f3d7b59a0162ae1142 /lib/std/testing.zig
parent70ad84c8209ae7ab14472f77f9452820bc47c30e (diff)
downloadzig-b077f3ab7d55374d2770336db236ecd7b18238a8.tar.gz
zig-b077f3ab7d55374d2770336db236ecd7b18238a8.zip
Promoted "leak_count_allocator" to the main testing.allocator
Diffstat (limited to 'lib/std/testing.zig')
-rw-r--r--lib/std/testing.zig14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/std/testing.zig b/lib/std/testing.zig
index 07479a3852..4850f2e9b9 100644
--- a/lib/std/testing.zig
+++ b/lib/std/testing.zig
@@ -2,17 +2,17 @@ const builtin = @import("builtin");
const TypeId = builtin.TypeId;
const std = @import("std.zig");
+pub const LeakCountAllocator = @import("testing/leak_count_allocator.zig").LeakCountAllocator;
+pub const FailingAllocator = @import("testing/failing_allocator.zig").FailingAllocator;
+
/// This should only be used in temporary test programs.
pub const allocator = &allocator_instance.allocator;
-pub var allocator_instance = std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]);
-var allocator_mem: [100 * 1024]u8 = undefined;
+pub var allocator_instance = LeakCountAllocator.init(&base_allocator_instance.allocator);
-pub const FailingAllocator = @import("testing/failing_allocator.zig").FailingAllocator;
-pub const failing_allocator = &FailingAllocator.init(allocator, 0).allocator;
+pub const failing_allocator = &FailingAllocator.init(&base_allocator_instance.allocator, 0).allocator;
-pub const LeakCountAllocator = @import("testing/leak_count_allocator.zig").LeakCountAllocator;
-pub var leak_count_allocator_instance = LeakCountAllocator.init(allocator);
-pub const leak_count_allocator = &leak_count_allocator_instance.allocator;
+pub var base_allocator_instance = std.heap.ThreadSafeFixedBufferAllocator.init(allocator_mem[0..]);
+var allocator_mem: [100 * 1024]u8 = undefined;
/// This function is intended to be used only in tests. It prints diagnostics to stderr
/// and then aborts when actual_error_union is not expected_error.