Skip to content

Commit d422d57

Browse files
committed
avoid std.debug.global_allocator in http headers tests
1 parent 8a251c4 commit d422d57

File tree

2 files changed

+28
-22
lines changed

2 files changed

+28
-22
lines changed

std/event/lock.zig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ pub const Lock = struct {
123123
};
124124

125125
test "std.event.Lock" {
126+
// TODO https://github.com/ziglang/zig/issues/2377
127+
if (true) return error.SkipZigTest;
126128
if (builtin.single_threaded) return error.SkipZigTest;
127129

128130
const allocator = std.heap.direct_allocator;

std/http/headers.zig

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,12 @@ const HeaderEntry = struct {
8383
}
8484
};
8585

86+
var test_memory: [32 * 1024]u8 = undefined;
87+
var test_fba_state = std.heap.FixedBufferAllocator.init(&test_memory);
88+
const test_allocator = &test_fba_state.allocator;
89+
8690
test "HeaderEntry" {
87-
var e = try HeaderEntry.init(debug.global_allocator, "foo", "bar", null);
91+
var e = try HeaderEntry.init(test_allocator, "foo", "bar", null);
8892
defer e.deinit();
8993
testing.expectEqualSlices(u8, "foo", e.name);
9094
testing.expectEqualSlices(u8, "bar", e.value);
@@ -376,7 +380,7 @@ pub const Headers = struct {
376380
};
377381

378382
test "Headers.iterator" {
379-
var h = Headers.init(debug.global_allocator);
383+
var h = Headers.init(test_allocator);
380384
defer h.deinit();
381385
try h.append("foo", "bar", null);
382386
try h.append("cookie", "somevalue", null);
@@ -399,7 +403,7 @@ test "Headers.iterator" {
399403
}
400404

401405
test "Headers.contains" {
402-
var h = Headers.init(debug.global_allocator);
406+
var h = Headers.init(test_allocator);
403407
defer h.deinit();
404408
try h.append("foo", "bar", null);
405409
try h.append("cookie", "somevalue", null);
@@ -409,7 +413,7 @@ test "Headers.contains" {
409413
}
410414

411415
test "Headers.delete" {
412-
var h = Headers.init(debug.global_allocator);
416+
var h = Headers.init(test_allocator);
413417
defer h.deinit();
414418
try h.append("foo", "bar", null);
415419
try h.append("baz", "qux", null);
@@ -437,7 +441,7 @@ test "Headers.delete" {
437441
}
438442

439443
test "Headers.orderedRemove" {
440-
var h = Headers.init(debug.global_allocator);
444+
var h = Headers.init(test_allocator);
441445
defer h.deinit();
442446
try h.append("foo", "bar", null);
443447
try h.append("baz", "qux", null);
@@ -460,7 +464,7 @@ test "Headers.orderedRemove" {
460464
}
461465

462466
test "Headers.swapRemove" {
463-
var h = Headers.init(debug.global_allocator);
467+
var h = Headers.init(test_allocator);
464468
defer h.deinit();
465469
try h.append("foo", "bar", null);
466470
try h.append("baz", "qux", null);
@@ -483,7 +487,7 @@ test "Headers.swapRemove" {
483487
}
484488

485489
test "Headers.at" {
486-
var h = Headers.init(debug.global_allocator);
490+
var h = Headers.init(test_allocator);
487491
defer h.deinit();
488492
try h.append("foo", "bar", null);
489493
try h.append("cookie", "somevalue", null);
@@ -503,7 +507,7 @@ test "Headers.at" {
503507
}
504508

505509
test "Headers.getIndices" {
506-
var h = Headers.init(debug.global_allocator);
510+
var h = Headers.init(test_allocator);
507511
defer h.deinit();
508512
try h.append("foo", "bar", null);
509513
try h.append("set-cookie", "x=1", null);
@@ -515,27 +519,27 @@ test "Headers.getIndices" {
515519
}
516520

517521
test "Headers.get" {
518-
var h = Headers.init(debug.global_allocator);
522+
var h = Headers.init(test_allocator);
519523
defer h.deinit();
520524
try h.append("foo", "bar", null);
521525
try h.append("set-cookie", "x=1", null);
522526
try h.append("set-cookie", "y=2", null);
523527

524528
{
525-
const v = try h.get(debug.global_allocator, "not-present");
529+
const v = try h.get(test_allocator, "not-present");
526530
testing.expect(null == v);
527531
}
528532
{
529-
const v = (try h.get(debug.global_allocator, "foo")).?;
530-
defer debug.global_allocator.free(v);
533+
const v = (try h.get(test_allocator, "foo")).?;
534+
defer test_allocator.free(v);
531535
const e = v[0];
532536
testing.expectEqualSlices(u8, "foo", e.name);
533537
testing.expectEqualSlices(u8, "bar", e.value);
534538
testing.expectEqual(false, e.never_index);
535539
}
536540
{
537-
const v = (try h.get(debug.global_allocator, "set-cookie")).?;
538-
defer debug.global_allocator.free(v);
541+
const v = (try h.get(test_allocator, "set-cookie")).?;
542+
defer test_allocator.free(v);
539543
{
540544
const e = v[0];
541545
testing.expectEqualSlices(u8, "set-cookie", e.name);
@@ -552,30 +556,30 @@ test "Headers.get" {
552556
}
553557

554558
test "Headers.getCommaSeparated" {
555-
var h = Headers.init(debug.global_allocator);
559+
var h = Headers.init(test_allocator);
556560
defer h.deinit();
557561
try h.append("foo", "bar", null);
558562
try h.append("set-cookie", "x=1", null);
559563
try h.append("set-cookie", "y=2", null);
560564

561565
{
562-
const v = try h.getCommaSeparated(debug.global_allocator, "not-present");
566+
const v = try h.getCommaSeparated(test_allocator, "not-present");
563567
testing.expect(null == v);
564568
}
565569
{
566-
const v = (try h.getCommaSeparated(debug.global_allocator, "foo")).?;
567-
defer debug.global_allocator.free(v);
570+
const v = (try h.getCommaSeparated(test_allocator, "foo")).?;
571+
defer test_allocator.free(v);
568572
testing.expectEqualSlices(u8, "bar", v);
569573
}
570574
{
571-
const v = (try h.getCommaSeparated(debug.global_allocator, "set-cookie")).?;
572-
defer debug.global_allocator.free(v);
575+
const v = (try h.getCommaSeparated(test_allocator, "set-cookie")).?;
576+
defer test_allocator.free(v);
573577
testing.expectEqualSlices(u8, "x=1,y=2", v);
574578
}
575579
}
576580

577581
test "Headers.sort" {
578-
var h = Headers.init(debug.global_allocator);
582+
var h = Headers.init(test_allocator);
579583
defer h.deinit();
580584
try h.append("foo", "bar", null);
581585
try h.append("cookie", "somevalue", null);
@@ -596,7 +600,7 @@ test "Headers.sort" {
596600
}
597601

598602
test "Headers.format" {
599-
var h = Headers.init(debug.global_allocator);
603+
var h = Headers.init(test_allocator);
600604
defer h.deinit();
601605
try h.append("foo", "bar", null);
602606
try h.append("cookie", "somevalue", null);

0 commit comments

Comments
 (0)