In the middle of porting core:testing

2 files changed, 9 insertions, 9 deletions

diff --git a/core/testing/runner.odin b/core/testing/runner.odin
index 03115b165..a184578a6 100644
--- a/core/testing/runner.odin
+++ b/core/testing/runner.odin
@@ -20,7 +20,7 @@ import "core:io"
 @require import "core:log"
 import "core:math/rand"
 import "core:mem"
-import "core:os"
+import os "core:os/os2"
 import "core:slice"
 @require import "core:strings"
 import "core:sync/chan"
@@ -219,8 +219,8 @@ runner :: proc(internal_tests: []Internal_Test) -> bool {
 		}
 	}
 
-	stdout := io.to_writer(os.stream_from_handle(os.stdout))
-	stderr := io.to_writer(os.stream_from_handle(os.stderr))
+	stdout := os.stdout.stream
+	stderr := os.stderr.stream
 
 	// The animations are only ever shown through STDOUT;
 	// STDERR is used exclusively for logging regardless of error level.
@@ -317,7 +317,7 @@ runner :: proc(internal_tests: []Internal_Test) -> bool {
 	// -- Set thread count.
 
 	when TEST_THREADS == 0 {
-		thread_count := os.processor_core_count()
+		thread_count := os.get_processor_core_count()
 	} else {
 		thread_count := max(1, TEST_THREADS)
 	}
diff --git a/core/testing/signal_handler_libc.odin b/core/testing/signal_handler_libc.odin
index 74608bb48..593d2c285 100644
--- a/core/testing/signal_handler_libc.odin
+++ b/core/testing/signal_handler_libc.odin
@@ -11,11 +11,11 @@ package testing
 		blob1807:    Windows Win32 API rewrite.
 */
 
-import "base:intrinsics"
-import "core:c/libc"
-import "core:os"
-import "core:sync"
-import "core:terminal/ansi"
+import    "base:intrinsics"
+import    "core:c/libc"
+import os "core:os/os2"
+import    "core:sync"
+import    "core:terminal/ansi"
 
 @(private="file") stop_runner_flag: libc.sig_atomic_t