core:os -> core:os/old && core:os/os2 -> core:os

tests/core/encoding/hxa/test_core_hxa.odin

@@ -6,7 +6,7 @@ import "core:testing"
 
 TEAPOT_PATH :: ODIN_ROOT + "tests/core/assets/HXA/teapot.hxa"
 
-import os "core:os/os2"
+import "core:os"
 
 @test
 test_read :: proc(t: ^testing.T) {

tests/core/flags/test_core_flags.odin

@@ -1,16 +1,16 @@
 package test_core_flags
 
-import "base:runtime"
-import "core:bytes"
-import "core:flags"
-import "core:fmt"
-@require import "core:log"
-import "core:math"
-@require import "core:net"
-import os "core:os/os2"
-import "core:strings"
-import "core:testing"
-import "core:time/datetime"
+import            "base:runtime"
+import            "core:bytes"
+import            "core:flags"
+import            "core:fmt"
+@(require) import "core:log"
+import            "core:math"
+@(require) import "core:net"
+import            "core:os"
+import            "core:strings"
+import            "core:testing"
+import            "core:time/datetime"
 
 Custom_Data :: struct {
 	a: int,

tests/core/io/test_core_io.odin

@@ -1,12 +1,12 @@
 package test_core_io
 
-import    "core:bufio"
-import    "core:bytes"
-import    "core:io"
-import    "core:log"
-import os "core:os/os2"
-import    "core:strings"
-import    "core:testing"
+import "core:bufio"
+import "core:bytes"
+import "core:io"
+import "core:log"
+import "core:os"
+import "core:strings"
+import "core:testing"
 
 Passed_Tests :: distinct io.Stream_Mode_Set
 

tests/core/nbio/fs.odin

@@ -1,9 +1,9 @@
 package tests_nbio
 
-import    "core:nbio"
-import    "core:testing"
-import    "core:time"
-import os "core:os/os2"
+import "core:nbio"
+import "core:testing"
+import "core:time"
+import "core:os"
 
 @(test)
 close_invalid_handle :: proc(t: ^testing.T) {

tests/core/nbio/nbio.odin

@@ -1,11 +1,11 @@
 package tests_nbio
 
-import    "core:log"
-import    "core:nbio"
-import    "core:testing"
-import    "core:thread"
-import    "core:time"
-import os "core:os/os2"
+import "core:log"
+import "core:nbio"
+import "core:testing"
+import "core:thread"
+import "core:time"
+import "core:os"
 
 ev :: testing.expect_value
 e  :: testing.expect

tests/core/normal.odin

@@ -37,7 +37,7 @@ download_assets :: proc "contextless" () {
 @(require) import "net"
 @(require) import "odin"
 @(require) import "os"
-@(require) import "os/os2"
+@(require) import "os/old"
 @(require) import "reflect"
 @(require) import "runtime"
 @(require) import "slice"

tests/core/os/dir.odin

@@ -1,14 +1,14 @@
-package tests_core_os_os2
+package tests_core_os
 
-import os "core:os/os2"
-import    "core:log"
-import    "core:slice"
-import    "core:testing"
-import    "core:strings"
+import "core:os"
+import "core:log"
+import "core:slice"
+import "core:testing"
+import "core:strings"
 
 @(test)
 test_read_dir :: proc(t: ^testing.T) {
-	path, err_join := os.join_path({#directory, "../dir"}, context.allocator)
+	path, err_join := os.join_path({#directory, "dir"}, context.allocator)
 	defer delete(path)
 
 	fis, err_read := os.read_all_directory_by_path(path, context.allocator)
@@ -17,7 +17,7 @@ test_read_dir :: proc(t: ^testing.T) {
 	slice.sort_by_key(fis, proc(fi: os.File_Info) -> string { return fi.name })
 
 	if err_read == .Unsupported {
-		log.warn("os2 directory functionality is unsupported, skipping test")
+		log.warn("core:os directory functionality is unsupported, skipping test")
 		return
 	}
 
@@ -34,7 +34,7 @@ test_read_dir :: proc(t: ^testing.T) {
 
 @(test)
 test_walker :: proc(t: ^testing.T) {
-	path, err := os.join_path({#directory, "../dir"}, context.allocator)
+	path, err := os.join_path({#directory, "dir"}, context.allocator)
 	defer delete(path)
 	testing.expect_value(t, err, nil)
 
@@ -46,7 +46,7 @@ test_walker :: proc(t: ^testing.T) {
 
 @(test)
 test_walker_file :: proc(t: ^testing.T) {
-	path, err_join := os.join_path({#directory, "../dir"}, context.allocator)
+	path, err_join := os.join_path({#directory, "dir"}, context.allocator)
 	defer delete(path)
 	testing.expect_value(t, err_join, nil)
 
@@ -95,7 +95,7 @@ test_walker_internal :: proc(t: ^testing.T, w: ^os.Walker) {
 	}
 
 	if _, err := os.walker_error(w); err == .Unsupported {
-		log.warn("os2 directory functionality is unsupported, skipping test")
+		log.warn("core:os directory functionality is unsupported, skipping test")
 		return
 	}
 

tests/core/os/file.odin

@@ -1,7 +1,7 @@
-package tests_core_os_os2
+package tests_core_os
 
-import os "core:os/os2"
-import    "core:testing"
+import "core:os"
+import "core:testing"
 
 @(test)
 test_clone :: proc(t: ^testing.T) {

tests/core/os/old/os.odin

@@ -1,8 +1,8 @@
-package test_core_os
+package test_core_os_old
 
 import "core:c/libc"
 import win32 "core:sys/windows"
-import "core:os"
+import os "core:os/old"
 import "core:slice"
 import "core:testing"
 import "core:log"

tests/core/os/path.odin

@@ -1,11 +1,11 @@
-package tests_core_os_os2
+package tests_core_os
 
-import    "core:fmt"
-import os "core:os/os2"
-import    "core:log"
-import    "core:testing"
-import    "core:slice"
-import    "core:strings"
+import "core:fmt"
+import "core:os"
+import "core:log"
+import "core:testing"
+import "core:slice"
+import "core:strings"
 
 @(test)
 test_executable :: proc(t: ^testing.T) {
@@ -351,12 +351,12 @@ glob_tests := []Glob_Test{
 		err     = {},
 	},
 	{
-		pattern = ODIN_ROOT + "tests/core/os/os2/*.odin",
+		pattern = ODIN_ROOT + "tests/core/os/*.odin",
 		matches = {
-			ODIN_ROOT + "tests/core/os/os2/dir.odin",
-			ODIN_ROOT + "tests/core/os/os2/file.odin",
-			ODIN_ROOT + "tests/core/os/os2/path.odin",
-			ODIN_ROOT + "tests/core/os/os2/process.odin",
+			ODIN_ROOT + "tests/core/os/dir.odin",
+			ODIN_ROOT + "tests/core/os/file.odin",
+			ODIN_ROOT + "tests/core/os/path.odin",
+			ODIN_ROOT + "tests/core/os/process.odin",
 		},
 		err     = {},
 	},

tests/core/os/process.odin

@@ -1,9 +1,9 @@
 #+build !windows
-package tests_core_os_os2
+package tests_core_os
 
-import os "core:os/os2"
-import    "core:log"
-import    "core:testing"
+import "core:os"
+import "core:log"
+import "core:testing"
 
 @(test)
 test_process_exec :: proc(t: ^testing.T) {

tests/core/sys/kqueue/structs.odin

@@ -1,9 +1,9 @@
 #+build darwin, freebsd, openbsd, netbsd
 package tests_core_sys_kqueue
 
-import    "core:strings"
-import    "core:testing"
-import os "core:os/os2"
+import "core:strings"
+import "core:testing"
+import "core:os"
 
 @(test)
 structs :: proc(t: ^testing.T) {

tests/documentation/documentation_tester.odin

@@ -1,6 +1,6 @@
 package documentation_tester
 
-import os  "core:os/os2"
+import     "core:os"
 import     "core:fmt"
 import     "core:strings"
 import     "core:odin/ast"
@@ -267,7 +267,7 @@ write_test_suite :: proc(example_tests: []Example_Test) {
 `#+private
 package documentation_verification
 
-import os "core:os/os2"
+import "core:os"
 import "core:mem"
 import "core:io"
 import "core:fmt"