Get tests passing again

`T` no longer has a writer assigned to it.

`test_core_cbor.odin` has global state and is run with `odin test`,
so I've set it to use only one thread.
This commit is contained in:
Feoramund
2024-05-27 20:42:35 -04:00
parent 87ea4a2652
commit 852f694bee
3 changed files with 9 additions and 9 deletions

View File

@@ -25,7 +25,7 @@ rem %PATH_TO_ODIN% run encoding/hxa %COMMON% %COLLECTION% -out:test_hxa.exe |
%PATH_TO_ODIN% run encoding/json %COMMON% -out:test_json.exe || exit /b
%PATH_TO_ODIN% run encoding/varint %COMMON% -out:test_varint.exe || exit /b
%PATH_TO_ODIN% run encoding/xml %COMMON% -out:test_xml.exe || exit /b
%PATH_TO_ODIN% test encoding/cbor %COMMON% -out:test_cbor.exe || exit /b
%PATH_TO_ODIN% test encoding/cbor %COMMON% -out:test_cbor.exe -define:test_threads=1 -define:test_fancy=false || exit /b
%PATH_TO_ODIN% run encoding/hex %COMMON% -out:test_hex.exe || exit /b
%PATH_TO_ODIN% run encoding/base64 %COMMON% -out:test_base64.exe || exit /b

View File

@@ -21,7 +21,7 @@ import "core:fmt"
import "core:mem"
import "core:os"
import "core:io"
// import "core:io"
TEST_count := 0
TEST_fail := 0
@@ -45,8 +45,8 @@ when ODIN_TEST {
}
main :: proc() {
w := io.to_writer(os.stream_from_handle(os.stdout))
t := testing.T{w=w}
// w := io.to_writer(os.stream_from_handle(os.stdout))
t := testing.T{}//{w=w}
zlib_test(&t)
gzip_test(&t)
shoco_test(&t)
@@ -195,4 +195,4 @@ shoco_test :: proc(t: ^testing.T) {
size, err = shoco.decompress(v.compressed[:v.short_sentinel], buffer[:])
expect(t, err == .Stream_Too_Short, "Expected `decompress` to return `Stream_Too_Short` because there was no more data after non-ASCII sentinel.")
}
}
}

View File

@@ -14,7 +14,7 @@ failed :: proc(t: ^testing.T, ok: bool, loc := #caller_location) -> bool {
TEST_count += 1
if !ok {
fmt.wprintf(t.w, "%v: ", loc)
fmt.printf(/*t.w,*/ "%v: ", loc)
t.error_count += 1
TEST_fail += 1
}
@@ -25,7 +25,7 @@ failed :: proc(t: ^testing.T, ok: bool, loc := #caller_location) -> bool {
expect :: testing.expect
logf :: proc(t: ^testing.T, format: string, args: ..any) {
fmt.wprintf(t.w, format, ..args)
fmt.printf(/*t.w,*/ format, ..args)
}
// find correct byte offsets
@@ -380,7 +380,7 @@ main :: proc() {
t: testing.T
stream := os.stream_from_handle(os.stdout)
w := io.to_writer(stream)
t.w = w
// t.w = w
test_find(&t)
test_match(&t)
@@ -396,4 +396,4 @@ main :: proc() {
if TEST_fail > 0 {
os.exit(1)
}
}
}