mirror of
https://github.com/Ed94/Odin.git
synced 2026-08-06 15:48:51 +00:00
Make testing.fail_now divergent
This is in line with the old way it worked on Windows.
This commit is contained in:
+23
-14
@@ -497,6 +497,7 @@ runner :: proc(internal_tests: []Internal_Test) -> bool {
|
|||||||
data.it = it
|
data.it = it
|
||||||
data.t.seed = shared_random_seed
|
data.t.seed = shared_random_seed
|
||||||
data.t.error_count = 0
|
data.t.error_count = 0
|
||||||
|
data.t._fail_now_called = false
|
||||||
|
|
||||||
thread.pool_add_task(&pool, task.allocator, run_test_task, data, run_index)
|
thread.pool_add_task(&pool, task.allocator, run_test_task, data, run_index)
|
||||||
}
|
}
|
||||||
@@ -645,28 +646,36 @@ runner :: proc(internal_tests: []Internal_Test) -> bool {
|
|||||||
"A signal (%v) was raised to stop test #%i %s.%s, but it was unable to be found.",
|
"A signal (%v) was raised to stop test #%i %s.%s, but it was unable to be found.",
|
||||||
reason, test_index, it.pkg, it.name)
|
reason, test_index, it.pkg, it.name)
|
||||||
|
|
||||||
if test_index not_in failed_test_reason_map {
|
// The order this is handled in is a little particular.
|
||||||
// We only write a new error message here if there wasn't one
|
task_data: ^Task_Data
|
||||||
// already, because the message we can provide based only on
|
|
||||||
// the signal won't be very useful, whereas asserts and panics
|
|
||||||
// will provide a user-written error message.
|
|
||||||
failed_test_reason_map[test_index] = fmt.aprintf("Signal caught: %v", reason, allocator = shared_log_allocator)
|
|
||||||
pkg_log.fatalf("Caught signal to stop test #%i %s.%s for: %v.", test_index, it.pkg, it.name, reason)
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
find_task_data_for_stop_signal: for &data in task_data_slots {
|
find_task_data_for_stop_signal: for &data in task_data_slots {
|
||||||
if data.it.pkg == it.pkg && data.it.name == it.name {
|
if data.it.pkg == it.pkg && data.it.name == it.name {
|
||||||
end_t(&data.t)
|
task_data = &data
|
||||||
break find_task_data_for_stop_signal
|
break find_task_data_for_stop_signal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
when FANCY_OUTPUT {
|
fmt.assertf(task_data != nil, "A signal (%v) was raised to stop test #%i %s.%s, but its task data is missing.",
|
||||||
bypass_progress_overwrite = true
|
reason, test_index, it.pkg, it.name)
|
||||||
signals_were_raised = true
|
|
||||||
|
if !task_data.t._fail_now_called {
|
||||||
|
if test_index not_in failed_test_reason_map {
|
||||||
|
// We only write a new error message here if there wasn't one
|
||||||
|
// already, because the message we can provide based only on
|
||||||
|
// the signal won't be very useful, whereas asserts and panics
|
||||||
|
// will provide a user-written error message.
|
||||||
|
failed_test_reason_map[test_index] = fmt.aprintf("Signal caught: %v", reason, allocator = shared_log_allocator)
|
||||||
|
pkg_log.fatalf("Caught signal to stop test #%i %s.%s for: %v.", test_index, it.pkg, it.name, reason)
|
||||||
|
}
|
||||||
|
|
||||||
|
when FANCY_OUTPUT {
|
||||||
|
bypass_progress_overwrite = true
|
||||||
|
signals_were_raised = true
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
end_t(&task_data.t)
|
||||||
|
|
||||||
total_failure_count += 1
|
total_failure_count += 1
|
||||||
total_done_count += 1
|
total_done_count += 1
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,7 +48,7 @@ T :: struct {
|
|||||||
// tests during channel transmission.
|
// tests during channel transmission.
|
||||||
_log_allocator: runtime.Allocator,
|
_log_allocator: runtime.Allocator,
|
||||||
|
|
||||||
_fail_now: proc() -> !,
|
_fail_now_called: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -66,15 +66,20 @@ fail :: proc(t: ^T, loc := #caller_location) {
|
|||||||
pkg_log.error("FAIL", location=loc)
|
pkg_log.error("FAIL", location=loc)
|
||||||
}
|
}
|
||||||
|
|
||||||
fail_now :: proc(t: ^T, msg := "", loc := #caller_location) {
|
// fail_now will cause a test to immediately fail and abort, much in the same
|
||||||
|
// way a failed assertion or panic call will stop a thread.
|
||||||
|
//
|
||||||
|
// It is for when you absolutely need a test to fail without calling any of its
|
||||||
|
// deferred statements. It will be cleaner than a regular assert or panic,
|
||||||
|
// as the test runner will know to expect the signal this procedure will raise.
|
||||||
|
fail_now :: proc(t: ^T, msg := "", loc := #caller_location) -> ! {
|
||||||
|
t._fail_now_called = true
|
||||||
if msg != "" {
|
if msg != "" {
|
||||||
pkg_log.error("FAIL:", msg, location=loc)
|
pkg_log.error("FAIL:", msg, location=loc)
|
||||||
} else {
|
} else {
|
||||||
pkg_log.error("FAIL", location=loc)
|
pkg_log.error("FAIL", location=loc)
|
||||||
}
|
}
|
||||||
if t._fail_now != nil {
|
runtime.trap()
|
||||||
t._fail_now()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
failed :: proc(t: ^T) -> bool {
|
failed :: proc(t: ^T) -> bool {
|
||||||
|
|||||||
Reference in New Issue
Block a user