From a39cb034ea0ae4f608ebcd7fa98df5d58d638668 Mon Sep 17 00:00:00 2001
From: Haze Booth <isnt@haze.cool>
Date: Tue, 5 May 2020 11:49:33 -0400
Subject: [PATCH 1/2] Add setUseTestEventedIO for test steps in build.zig

---
 lib/std/build.zig | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/std/build.zig b/lib/std/build.zig
index 85a65393ec..2b7eb254ee 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1132,6 +1132,7 @@ pub const LibExeObjStep = struct {
     name_prefix: []const u8,
     filter: ?[]const u8,
     single_threaded: bool,
+    evented_io: bool = false,
     code_model: builtin.CodeModel = .default,
 
     root_src: ?FileSource,
@@ -1559,6 +1560,11 @@ pub const LibExeObjStep = struct {
         self.filter = text;
     }
 
+    pub fn setUseTestEventedIo(self: *LibExeObjStep, use_evented_io: bool) void {
+        assert(self.kind == Kind.Test);
+        self.evented_io = use_evented_io;
+    }
+
     pub fn addCSourceFile(self: *LibExeObjStep, file: []const u8, args: []const []const u8) void {
         self.addCSourceFileSource(.{
             .args = args,
@@ -1864,6 +1870,10 @@ pub const LibExeObjStep = struct {
             try zig_args.append(filter);
         }
 
+        if (self.evented_io) {
+            try zig_args.append("--test-evented-io");
+        }
+
         if (self.name_prefix.len != 0) {
             try zig_args.append("--test-name-prefix");
             try zig_args.append(self.name_prefix);

From 6f3d76f61ef7f94598c77907e5083608d223a616 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Tue, 5 May 2020 15:18:04 -0400
Subject: [PATCH 2/2] simplify test-evented-io build setting

---
 lib/std/build.zig | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/std/build.zig b/lib/std/build.zig
index 2b7eb254ee..8a38383e87 100644
--- a/lib/std/build.zig
+++ b/lib/std/build.zig
@@ -1132,7 +1132,7 @@ pub const LibExeObjStep = struct {
     name_prefix: []const u8,
     filter: ?[]const u8,
     single_threaded: bool,
-    evented_io: bool = false,
+    test_evented_io: bool = false,
     code_model: builtin.CodeModel = .default,
 
     root_src: ?FileSource,
@@ -1560,11 +1560,6 @@ pub const LibExeObjStep = struct {
         self.filter = text;
     }
 
-    pub fn setUseTestEventedIo(self: *LibExeObjStep, use_evented_io: bool) void {
-        assert(self.kind == Kind.Test);
-        self.evented_io = use_evented_io;
-    }
-
     pub fn addCSourceFile(self: *LibExeObjStep, file: []const u8, args: []const []const u8) void {
         self.addCSourceFileSource(.{
             .args = args,
@@ -1870,7 +1865,7 @@ pub const LibExeObjStep = struct {
             try zig_args.append(filter);
         }
 
-        if (self.evented_io) {
+        if (self.test_evented_io) {
             try zig_args.append("--test-evented-io");
         }