diff --git a/apps/sel4test-driver/src/main.c b/apps/sel4test-driver/src/main.c index 0df45d86..4631adec 100644 --- a/apps/sel4test-driver/src/main.c +++ b/apps/sel4test-driver/src/main.c @@ -184,7 +184,7 @@ static void init_timer(void) ZF_LOGF_IF(error, "Failed to allocate notification object for tests"); error = seL4_TCB_BindNotification(simple_get_tcb(&env.simple), env.timer_notification.cptr); - ZF_LOGF_IF(error, "Failed to bind timer notification to sel4test-driver\n"); + ZF_LOGF_IF(error, "Failed to bind timer notification to sel4test-driver"); /* set up the timer manager */ tm_init(&env.tm, &env.ltimer, &env.ops, 1); @@ -323,7 +323,7 @@ void sel4test_run_tests(struct driver_env *e) /* Extract and filter the tests based on the regex */ regex_t reg; int error = regcomp(®, CONFIG_TESTPRINTER_REGEX, REG_EXTENDED | REG_NOSUB); - ZF_LOGF_IF(error, "Error compiling regex \"%s\"\n", CONFIG_TESTPRINTER_REGEX); + ZF_LOGF_IF(error, "Error compiling regex \"%s\"", CONFIG_TESTPRINTER_REGEX); int skipped_tests = 0; /* get all the tests in the test case section in the driver */ diff --git a/apps/sel4test-driver/src/tests/timer.c b/apps/sel4test-driver/src/tests/timer.c index 2d650eb7..f4f8dd0f 100644 --- a/apps/sel4test-driver/src/tests/timer.c +++ b/apps/sel4test-driver/src/tests/timer.c @@ -33,7 +33,6 @@ static int test_callback(uintptr_t token) int test_timer(driver_env_t env) { - uint64_t time = 0; test_finished = false; timer_test_data_t test_data = { .goal_count = 3 }; @@ -46,7 +45,7 @@ int test_timer(driver_env_t env) while (!test_finished) { wait_for_timer_interrupt(env); - ZF_LOGV("Tick\n"); + ZF_LOGV("Tick"); error = tm_update(&env->tm); test_assert_fatal(!error); } @@ -79,7 +78,7 @@ test_gettime_timeout(driver_env_t env) while (!test_finished) { wait_for_timer_interrupt(env); - ZF_LOGV("Tick\n"); + ZF_LOGV("Tick"); error = tm_update(&env->tm); test_assert_fatal(!error); } diff --git a/apps/sel4test-driver/src/testtypes.c b/apps/sel4test-driver/src/testtypes.c index 2b2b8611..61e8fd7e 100644 --- a/apps/sel4test-driver/src/testtypes.c +++ b/apps/sel4test-driver/src/testtypes.c @@ -19,19 +19,19 @@ /* Bootstrap test type. */ static inline void bootstrap_set_up_test_type(uintptr_t e) { - ZF_LOGD("setting up bootstrap test type\n"); + ZF_LOGD("setting up bootstrap test type"); } static inline void bootstrap_tear_down_test_type(uintptr_t e) { - ZF_LOGD("tearing down bootstrap test type\n"); + ZF_LOGD("tearing down bootstrap test type"); } static inline void bootstrap_set_up(uintptr_t e) { - ZF_LOGD("set up bootstrap test\n"); + ZF_LOGD("set up bootstrap test"); } static inline void bootstrap_tear_down(uintptr_t e) { - ZF_LOGD("tear down bootstrap test\n"); + ZF_LOGD("tear down bootstrap test"); } static inline test_result_t bootstrap_run_test(struct testcase *test, uintptr_t e) { diff --git a/apps/sel4test-driver/src/timer.c b/apps/sel4test-driver/src/timer.c index 53b26966..3093c49e 100644 --- a/apps/sel4test-driver/src/timer.c +++ b/apps/sel4test-driver/src/timer.c @@ -78,7 +78,7 @@ void wait_for_timer_interrupt(driver_env_t env) void timeout(driver_env_t env, uint64_t ns, timeout_type_t timeout_type) { if (config_set(CONFIG_HAVE_TIMER)) { - ZF_LOGD_IF(timeServer_timeoutPending, "Overwriting a previous timeout request\n"); + ZF_LOGD_IF(timeServer_timeoutPending, "Overwriting a previous timeout request"); timeServer_timeoutType = timeout_type; int error = tm_register_cb(&env->tm, timeout_type, ns, 0, TIMER_ID, timeout_cb, env->timer_notify_test.cptr); diff --git a/apps/sel4test-driver/src/timer.h b/apps/sel4test-driver/src/timer.h index 5fd0d9bf..100271af 100644 --- a/apps/sel4test-driver/src/timer.h +++ b/apps/sel4test-driver/src/timer.h @@ -11,7 +11,7 @@ #define TIMER_ID 0 -/* Timing related functions used only by in sel4test-driver */ +/* Timing related functions used only within sel4test-driver */ void handle_timer_interrupts(driver_env_t env, seL4_Word badge); void wait_for_timer_interrupt(driver_env_t env); void timeout(driver_env_t env, uint64_t ns, timeout_type_t timeout); diff --git a/apps/sel4test-tests/src/helpers.c b/apps/sel4test-tests/src/helpers.c index 2fe91f58..f3a82439 100644 --- a/apps/sel4test-tests/src/helpers.c +++ b/apps/sel4test-tests/src/helpers.c @@ -33,7 +33,7 @@ int check_zeroes(seL4_Word addr, seL4_Word size_bytes) seL4_Word size_words = size_bytes / sizeof(seL4_Word); while (size_words--) { if (*p++ != 0) { - ZF_LOGE("Found non-zero at position %ld: %lu\n", ((long)p) - (addr), (unsigned long)p[-1]); + ZF_LOGE("Found non-zero at position %ld: %lu", ((long)p) - (addr), (unsigned long)p[-1]); return 0; } } @@ -432,7 +432,7 @@ static void sel4test_send_time_request(seL4_CPtr ep, uint64_t ns, sel4test_outpu tag = seL4_MessageInfo_new(0, 0, 0, 1); break; default: - ZF_LOGE("Invalid time request\n"); + ZF_LOGE("Invalid time request"); break; } @@ -566,7 +566,7 @@ void set_helper_tfep(env_t env, helper_thread_t *thread, seL4_CPtr tfep) #ifdef CONFIG_KERNEL_MCS int error = seL4_TCB_SetTimeoutEndpoint(thread->thread.tcb.cptr, tfep); if (error != seL4_NoError) { - ZF_LOGF("Failed to set tfep\n"); + ZF_LOGF("Failed to set tfep"); } #endif } diff --git a/apps/sel4test-tests/src/main.c b/apps/sel4test-tests/src/main.c index 60886cf1..a6e3cb2d 100644 --- a/apps/sel4test-tests/src/main.c +++ b/apps/sel4test-tests/src/main.c @@ -235,7 +235,7 @@ int main(int argc, char **argv) result = test->function((uintptr_t)&env); } else { result = FAILURE; - ZF_LOGF("Cannot find test %s\n", init_data->name); + ZF_LOGF("Cannot find test %s", init_data->name); } printf("Test %s %s\n", init_data->name, result == SUCCESS ? "passed" : "failed"); diff --git a/apps/sel4test-tests/src/tests/fpu.c b/apps/sel4test-tests/src/tests/fpu.c index bafad72b..5e167bb4 100644 --- a/apps/sel4test-tests/src/tests/fpu.c +++ b/apps/sel4test-tests/src/tests/fpu.c @@ -187,4 +187,4 @@ int smp_test_fpu(env_t env) return sel4test_get_result(); } DEFINE_TEST(FPU0002, "Test FPU remain valid across core migration", smp_test_fpu, - config_set(CONFIG_MAX_NUM_NODES) &&config_set(CONFIG_HAVE_TIMER) &&CONFIG_MAX_NUM_NODES > 1) + config_set(CONFIG_HAVE_TIMER) &&(CONFIG_MAX_NUM_NODES > 1)) diff --git a/apps/sel4test-tests/src/tests/ipc.c b/apps/sel4test-tests/src/tests/ipc.c index d34b9e3d..6e5ff041 100644 --- a/apps/sel4test-tests/src/tests/ipc.c +++ b/apps/sel4test-tests/src/tests/ipc.c @@ -291,7 +291,7 @@ static int test_ipc_pair(env_t env, test_func_t fa, test_func_t fb, bool inter_a for (int sender_prio = 98; sender_prio <= 102; sender_prio++) { for (int waiter_prio = 100; waiter_prio <= 100; waiter_prio++) { for (int sender_first = 0; sender_first <= 1; sender_first++) { - ZF_LOGD("%d %s %d\n", + ZF_LOGD("%d %s %d", sender_prio, sender_first ? "->" : "<-", waiter_prio); seL4_Word thread_a_arg0, thread_b_arg0; seL4_CPtr thread_a_reply, thread_b_reply; @@ -469,13 +469,13 @@ server_fn(seL4_CPtr endpoint, seL4_CPtr reply, volatile int *state) *state = *state + 1; seL4_MessageInfo_t info = api_nbsend_recv(endpoint, info, endpoint, NULL, reply); /* from here on we are running on borrowed time */ - ZF_LOGD("Server awake!\n"); + ZF_LOGD("Server awake!"); int i = 0; while (i < RUNS) { test_eq(seL4_GetMR(0), (seL4_Word) 12345678); seL4_SetMR(0, 0xdeadbeef); *state = *state + 1; - ZF_LOGD("Server replyRecv\n"); + ZF_LOGD("Server replyRecv"); info = seL4_ReplyRecv(endpoint, info, NULL, reply); i++; } @@ -486,7 +486,7 @@ static void proxy_fn(seL4_CPtr receive_endpoint, seL4_CPtr call_endpoint, seL4_W seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, 0); /* signal the initialiser that we are awake */ - ZF_LOGD("Proxy nbsendrecv, sending on ep %lu, receiving on ep %lu, reply is %lu\n", call_endpoint, receive_endpoint, + ZF_LOGD("Proxy nbsendrecv, sending on ep %lu, receiving on ep %lu, reply is %lu", call_endpoint, receive_endpoint, reply); *state = *state + 1; info = api_nbsend_recv(call_endpoint, info, receive_endpoint, NULL, reply); @@ -498,13 +498,13 @@ static void proxy_fn(seL4_CPtr receive_endpoint, seL4_CPtr call_endpoint, seL4_W test_eq(seL4_GetMR(0), (seL4_Word) 12345678); seL4_SetMR(0, 12345678); - ZF_LOGD("Proxy call\n"); + ZF_LOGD("Proxy call"); seL4_Call(call_endpoint, info); test_eq(seL4_GetMR(0), (seL4_Word) 0xdeadbeef); seL4_SetMR(0, 0xdeadbeef); - ZF_LOGD("Proxy replyRecv\n"); + ZF_LOGD("Proxy replyRecv"); *state = *state + 1; info = seL4_ReplyRecv(receive_endpoint, info, NULL, reply); i++; @@ -522,7 +522,7 @@ static void client_fn(seL4_CPtr endpoint, bool fastpath, int unused, volatile in seL4_SetMR(0, 12345678); seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, length); - ZF_LOGD("Client calling on ep %lu\n", endpoint); + ZF_LOGD("Client calling on ep %lu", endpoint); info = seL4_Call(endpoint, info); test_eq(seL4_GetMR(0), (seL4_Word) 0xdeadbeef); @@ -555,12 +555,12 @@ static int single_client_server_chain_test(env_t env, int fastpath, int prio_dif seL4_CPtr call_endpoint = vka_alloc_endpoint_leaky(&env->vka); create_helper_thread(env, &proxies[i]); set_helper_priority(env, &proxies[i], prio); - ZF_LOGD("Start proxy\n"); + ZF_LOGD("Start proxy"); start_helper(env, &proxies[i], (helper_fn_t) proxy_fn, receive_endpoint, call_endpoint, proxies[i].thread.reply.cptr, (seL4_Word) &proxy_state[i]); /* wait for proxy to initialise */ - ZF_LOGD("Recv for proxy\n"); + ZF_LOGD("Recv for proxy"); seL4_Wait(call_endpoint, NULL); test_eq(proxy_state[i], 1); /* now take away its scheduling context */ @@ -642,9 +642,9 @@ ipc0016_call_once_fn(seL4_CPtr endpoint, volatile int *state) { seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, 0); *state = *state + 1; - ZF_LOGD("Call %d\n", *state); + ZF_LOGD("Call %d", *state); seL4_Call(endpoint, info); - ZF_LOGD("Resumed with reply\n"); + ZF_LOGD("Resumed with reply"); *state = *state + 1; } @@ -653,15 +653,15 @@ static void ipc0016_reply_once_fn(seL4_CPtr endpoint, seL4_CPtr reply) seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, 0); /* send initialisation context back */ - ZF_LOGD("seL4_nbsendrecv\n"); + ZF_LOGD("seL4_nbsendrecv"); api_nbsend_recv(endpoint, info, endpoint, NULL, reply); /* reply */ - ZF_LOGD("Reply\n"); + ZF_LOGD("Reply"); seL4_Send(reply, info); /* wait (keeping sc) */ - ZF_LOGD("Recv\n"); + ZF_LOGD("Recv"); seL4_Wait(endpoint, NULL); test_check(!"should not get here"); @@ -708,7 +708,7 @@ DEFINE_TEST(IPC0016, "Test reply returns scheduling context", static void sender(seL4_CPtr endpoint, volatile int *state) { seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, 0); - ZF_LOGD("Client send\n"); + ZF_LOGD("Client send"); *state = 1; seL4_Send(endpoint, info); *state = 2; @@ -720,7 +720,7 @@ static void wait_server(seL4_CPtr endpoint, int messages) seL4_Send(endpoint, seL4_MessageInfo_new(0, 0, 0, 0)); int i = 0; while (i < messages) { - ZF_LOGD("Server wait\n"); + ZF_LOGD("Server wait"); seL4_Wait(endpoint, NULL); i++; } @@ -938,9 +938,9 @@ DEFINE_TEST(IPC0020, "test deleting a scheduling context while the client is wai static void ipc21_faulter_fn(int *addr) { - ZF_LOGD("Fault at %p\n", addr); + ZF_LOGD("Fault at %p", addr); *addr = 0xdeadbeef; - ZF_LOGD("Resumed\n"); + ZF_LOGD("Resumed"); } static void ipc21_fault_handler_fn(seL4_CPtr endpoint, vspace_t *vspace, reservation_t *res, seL4_CPtr reply) @@ -951,7 +951,7 @@ static void ipc21_fault_handler_fn(seL4_CPtr endpoint, vspace_t *vspace, reserva while (1) { test_check(seL4_isVMFault_tag(info)); void *addr = (void *) seL4_GetMR(seL4_VMFault_Addr); - ZF_LOGD("Handling fault at %p\n", addr); + ZF_LOGD("Handling fault at %p", addr); int error = vspace_new_pages_at_vaddr(vspace, addr, 1, seL4_PageBits, *res); test_eq(error, seL4_NoError); seL4_ReplyRecv(endpoint, info, NULL, reply); @@ -1012,7 +1012,7 @@ static seL4_CPtr ipc22_go; static void ipc22_server_fn(seL4_CPtr init_ep, seL4_CPtr reply_cap) { seL4_MessageInfo_t info = seL4_MessageInfo_new(0, 0, 0, 0); - ZF_LOGD("Server init\n"); + ZF_LOGD("Server init"); /* wait for the signal to go from the test runner - * we have to block here to wait for all the clients to @@ -1020,7 +1020,7 @@ static void ipc22_server_fn(seL4_CPtr init_ep, seL4_CPtr reply_cap) * by the same server and the point is to test stack spawning */ api_nbsend_wait(init_ep, info, init_ep, NULL); - ZF_LOGD("Server reply to fwded cap\n"); + ZF_LOGD("Server reply to fwded cap"); seL4_Send(reply_cap, info); } @@ -1043,9 +1043,9 @@ static void ipc22_stack_spawner_fn(env_t env, seL4_CPtr endpoint, int server_pri /* after the first nbsend, we want to signal the clients via init_ep */ first_ep = init_ep; - ZF_LOGD("Got another client\n"); + ZF_LOGD("Got another client"); /* start helper and allow to initialise */ - ZF_LOGD("Spawn server\n"); + ZF_LOGD("Spawn server"); start_helper(env, &servers[i], (helper_fn_t) ipc22_server_fn, init_ep, servers[i].thread.reply.cptr, 0, 0); /* wait for it to block */ @@ -1207,7 +1207,7 @@ static int test_delete_reply_cap_then_sc(env_t env) int error = seL4_TCB_SetPriority(env->tcb, env->tcb, 10); test_eq(error, 0); - ZF_LOGD("Removed sc\n"); + ZF_LOGD("Removed sc"); /* remove schedluing context */ error = api_sc_unbind(server.thread.sched_context.cptr); test_eq(error, seL4_NoError); @@ -1361,6 +1361,8 @@ static int test_sched_donation_cross_core(env_t env) return sel4test_get_result(); } -DEFINE_TEST(IPC0028, "Cross core sched donation", test_sched_donation_cross_core, - config_set(CONFIG_KERNEL_MCS) &&config_set(CONFIG_MAX_NUM_NODES) &&CONFIG_MAX_NUM_NODES > 1); +/* This test currently fails. + See https://github.com/seL4/seL4/issues/941 and https://github.com/seL4/seL4/pull/986 */ +DEFINE_TEST(IPC0028, "Cross core sched donation", test_sched_donation_cross_core, false); +/* config_set(CONFIG_KERNEL_MCS) &&(CONFIG_MAX_NUM_NODES > 1)); */ #endif /* CONFIG_KERNEL_MCS */ diff --git a/apps/sel4test-tests/src/tests/schedcontext.c b/apps/sel4test-tests/src/tests/schedcontext.c index dc08da95..ddbd10ca 100644 --- a/apps/sel4test-tests/src/tests/schedcontext.c +++ b/apps/sel4test-tests/src/tests/schedcontext.c @@ -352,18 +352,18 @@ DEFINE_TEST(SCHED_CONTEXT_0007, "test resuming a passive thread and binding sche static void sched_context0008_client_fn(seL4_CPtr send_ep, seL4_CPtr wait_ep) { - ZF_LOGD("Client send\n"); + ZF_LOGD("Client send"); api_nbsend_wait(send_ep, seL4_MessageInfo_new(0, 0, 0, 0), wait_ep, NULL); } static void sched_context0008_proxy_fn(seL4_CPtr send_ep, seL4_CPtr wait_ep) { /* signal to test runner that we are initialised and waiting for client */ - ZF_LOGD("Proxy init\n"); + ZF_LOGD("Proxy init"); api_nbsend_wait(send_ep, seL4_MessageInfo_new(0, 0, 0, 0), wait_ep, NULL); /* forward on the message we got */ - ZF_LOGD("Proxy fwd\n"); + ZF_LOGD("Proxy fwd"); api_nbsend_wait(send_ep, seL4_MessageInfo_new(0, 0, 0, 0), wait_ep, NULL); ZF_LOGF("Should not get here"); @@ -371,10 +371,10 @@ static void sched_context0008_proxy_fn(seL4_CPtr send_ep, seL4_CPtr wait_ep) static void sched_context0008_server_fn(seL4_CPtr init_ep, seL4_CPtr wait_ep) { - ZF_LOGD("Server init\n"); + ZF_LOGD("Server init"); /* tell test runner we are done by sending to init ep, then wait for proxy message */ api_nbsend_wait(init_ep, seL4_MessageInfo_new(0, 0, 0, 0), wait_ep, NULL); - ZF_LOGD("Server exit\n"); + ZF_LOGD("Server exit"); /* hold on to scheduling context */ } static int test_delete_sendwait_tcb(env_t env) @@ -386,28 +386,28 @@ static int test_delete_sendwait_tcb(env_t env) seL4_CPtr server_ep = vka_alloc_endpoint_leaky(&env->vka); /* set up and start server */ - ZF_LOGD("Create server\n"); + ZF_LOGD("Create server"); int error = create_passive_thread(env, &server, (helper_fn_t) sched_context0008_server_fn, server_ep, proxy_send, 0, 0); test_eq(error, 0); /* setup and start proxy */ - ZF_LOGD("Create proxy\n"); + ZF_LOGD("Create proxy"); error = create_passive_thread(env, &proxy, (helper_fn_t) sched_context0008_proxy_fn, proxy_send, client_send, 0, 0); test_eq(error, 0); - ZF_LOGD("Create client\n"); + ZF_LOGD("Create client"); /* create and start the client */ create_helper_thread(env, &client); start_helper(env, &client, (helper_fn_t) sched_context0008_client_fn, client_send, client_wait, 0, 0); - ZF_LOGD("Wait for server\n"); + ZF_LOGD("Wait for server"); /* wait for the server to finish, who has stolen the scheduling context */ wait_for_helper(&server); - ZF_LOGD("Kill server\n"); + ZF_LOGD("Kill server"); /* kill the server */ vka_free_object(&env->vka, &server.thread.tcb); @@ -415,10 +415,10 @@ static int test_delete_sendwait_tcb(env_t env) error = api_sc_bind(client.thread.sched_context.cptr, client.thread.tcb.cptr); test_eq(error, seL4_NoError); - ZF_LOGD("Signal client\n"); + ZF_LOGD("Signal client"); seL4_Signal(client_wait); - ZF_LOGD("Wait for client\n"); + ZF_LOGD("Wait for client"); /* now the client should finish */ wait_for_helper(&client); @@ -430,7 +430,7 @@ DEFINE_TEST(SCHED_CONTEXT_0008, "Test deleting a tcb running on donated sc", void sched_context_0009_server_fn(seL4_CPtr ep, volatile int *state, seL4_CPtr reply) { - ZF_LOGD("Server init\n"); + ZF_LOGD("Server init"); api_nbsend_recv(ep, seL4_MessageInfo_new(0, 0, 0, 0), ep, NULL, reply); while (1) { *state = *state + 1; @@ -439,7 +439,7 @@ sched_context_0009_server_fn(seL4_CPtr ep, volatile int *state, seL4_CPtr reply) void sched_context_0009_client_fn(seL4_CPtr ep, volatile int *state) { - ZF_LOGD("Client call\n"); + ZF_LOGD("Client call"); seL4_Call(ep, seL4_MessageInfo_new(0, 0, 0, 0)); if (state != NULL) { *state = *state + 1; @@ -487,7 +487,7 @@ int test_sched_context_goes_to_to_caller_on_reply_cap_delete(env_t env) /* save and resume client */ restart_after_syscall(env, &client); - printf("Waiting for client\n"); + printf("Waiting for client"); wait_for_helper(&client); return sel4test_get_result(); @@ -543,7 +543,7 @@ int test_sched_context_unbind_server(env_t env) /* save and resume client */ restart_after_syscall(env, &client); - printf("Waiting for client\n"); + printf("Waiting for client"); wait_for_helper(&client); return sel4test_get_result(); @@ -554,13 +554,13 @@ DEFINE_TEST(SCHED_CONTEXT_0010, "Test unbinding scheduling context from server", void sched_context_0011_proxy_fn(seL4_CPtr in, seL4_CPtr out, seL4_CPtr reply) { - ZF_LOGD("Proxy init\n"); + ZF_LOGD("Proxy init"); api_nbsend_recv(in, seL4_MessageInfo_new(0, 0, 0, 0), in, NULL, reply); - ZF_LOGD("Proxy call\n"); + ZF_LOGD("Proxy call"); seL4_Call(out, seL4_MessageInfo_new(0, 0, 0, 0)); - ZF_LOGD("Proxy here\n"); + ZF_LOGD("Proxy here"); } int test_revoke_reply_on_call_chain_returns_sc(env_t env) @@ -602,7 +602,7 @@ int test_revoke_reply_on_call_chain_returns_sc(env_t env) /* save and resume client */ restart_after_syscall(env, &client); - ZF_LOGD("Waiting for client\n"); + ZF_LOGD("Waiting for client"); wait_for_helper(&client); return sel4test_get_result(); @@ -642,7 +642,7 @@ test_revoke_reply_on_call_chain_unordered(env_t env) test_eq(error, seL4_NoError); /* kill the servers reply cap */ - ZF_LOGD("Nuke server reply cap\n"); + ZF_LOGD("Nuke server reply cap"); error = cnode_delete(env, server_reply); test_eq(error, seL4_NoError); @@ -712,7 +712,7 @@ test_revoke_sched_context_on_call_chain(env_t env) restart_after_syscall(env, &proxy); - ZF_LOGD("Waiting for proxy\n"); + ZF_LOGD("Waiting for proxy"); wait_for_helper(&proxy); error = api_sc_unbind_object(sched_context, proxy.thread.tcb.cptr); @@ -724,7 +724,7 @@ test_revoke_sched_context_on_call_chain(env_t env) restart_after_syscall(env, &client); - ZF_LOGD("Waiting for Client\n"); + ZF_LOGD("Waiting for Client"); wait_for_helper(&client); return sel4test_get_result(); diff --git a/apps/sel4test-tests/src/tests/scheduler.c b/apps/sel4test-tests/src/tests/scheduler.c index f79a25a4..71aef0cb 100644 --- a/apps/sel4test-tests/src/tests/scheduler.c +++ b/apps/sel4test-tests/src/tests/scheduler.c @@ -43,7 +43,7 @@ static int test_thread_suspend(env_t env) { helper_thread_t t1; volatile seL4_Word counter; - ZF_LOGD("test_thread_suspend\n"); + ZF_LOGD("test_thread_suspend"); create_helper_thread(env, &t1); set_helper_priority(env, &t1, 100); @@ -110,11 +110,11 @@ DEFINE_TEST(SCHED0000, "Test suspending and resuming a thread (flaky)", test_thr static int test_resume_self(struct env *env) { - ZF_LOGD("Starting test_resume_self\n"); + ZF_LOGD("Starting test_resume_self"); /* Ensure nothing bad happens if we resume ourselves. */ int error = seL4_TCB_Resume(env->tcb); test_error_eq(error, seL4_NoError); - ZF_LOGD("Ending test_resume_self\n"); + ZF_LOGD("Ending test_resume_self"); return sel4test_get_result(); } DEFINE_TEST(SCHED0002, "Test resuming ourselves", test_resume_self, true) @@ -201,10 +201,10 @@ static int test_suspend(struct env *env) helper_thread_t thread2a; helper_thread_t thread2b; - ZF_LOGD("Starting test_suspend\n"); + ZF_LOGD("Starting test_suspend"); create_helper_thread(env, &thread1); - ZF_LOGD("Show me\n"); + ZF_LOGD("Show me"); create_helper_thread(env, &thread2a); create_helper_thread(env, &thread2b); @@ -239,13 +239,13 @@ static int test_suspend(struct env *env) set_helper_priority(env, &thread2b, 101); suspend_test_step = 0; - ZF_LOGD(" "); + ZF_LOGD("Waiting..."); wait_for_helper(&thread1); wait_for_helper(&thread2b); CHECK_STEP(suspend_test_step, 6); - ZF_LOGD("\n"); + ZF_LOGD("Suspended"); cleanup_helper(env, &thread1); cleanup_helper(env, &thread2a); diff --git a/settings.cmake b/settings.cmake index 1b096ebe..b223b432 100644 --- a/settings.cmake +++ b/settings.cmake @@ -80,6 +80,7 @@ if(NOT Sel4testAllowSettingsOverride) KernelPlatformZynqmp OR KernelPlatformPolarfire OR KernelPlatformQuartz64 + OR KernelPlatformRocketchip OR KernelPlatformRocketchipZCU102 OR (SIMULATION AND (KernelArchRiscV OR KernelArchARM)) )