Skip to content

Include gen_config for CONFIG_SIMULATION - #157

Merged
lsf37 merged 1 commit into
masterfrom
julia/simulation-includes
Jun 3, 2026
Merged

Include gen_config for CONFIG_SIMULATION#157
lsf37 merged 1 commit into
masterfrom
julia/simulation-includes

Conversation

@midnightveil

@midnightveil midnightveil commented Jun 3, 2026

Copy link
Copy Markdown
Contributor

This wasn't included, so it wasn't defined, so it was always false and so this test always ran.

(Added in #146 without the header)

@midnightveil
midnightveil requested a review from lsf37 June 3, 2026 04:01
@midnightveil
midnightveil force-pushed the julia/simulation-includes branch from c624c37 to 383f2d6 Compare June 3, 2026 04:04
This wasn't included, so it wasn't defined, so it was
always false and so this test always ran.

Signed-off-by: Julia Vassiliki <julia.vassiliki@unsw.edu.au>
@midnightveil
midnightveil force-pushed the julia/simulation-includes branch from 383f2d6 to 5b36176 Compare June 3, 2026 04:06
@midnightveil

Copy link
Copy Markdown
Contributor Author

Currently the style checker is failing with:

diff --git a/apps/sel4test-tests/src/tests/faults.c b/apps/sel4test-tests/src/tests/faults.c
index d0320f0..2d74a42 100644
--- a/apps/sel4test-tests/src/tests/faults.c
+++ b/apps/sel4test-tests/src/tests/faults.c
@@ -1063,7 +1063,7 @@ static int test_timeout_fault_nested_servers(env_t env)
     return sel4test_get_result();
 }
 DEFINE_TEST(TIMEOUTFAULT0003, "Nested timeout fault", test_timeout_fault_nested_servers,
-            config_set(CONFIG_KERNEL_MCS) && !config_set(CONFIG_SIMULATION))
+            config_set(CONFIG_KERNEL_MCS)&& !config_set(CONFIG_SIMULATION))
 
 static void vm_enter(void)
 {

When I fix this it then complains again, wanting it back the other way:

diff --git a/apps/sel4test-tests/src/tests/faults.c b/apps/sel4test-tests/src/tests/faults.c
index 2d74a42..d0320f0 100644
--- a/apps/sel4test-tests/src/tests/faults.c
+++ b/apps/sel4test-tests/src/tests/faults.c
@@ -1063,7 +1063,7 @@ static int test_timeout_fault_nested_servers(env_t env)
     return sel4test_get_result();
 }
 DEFINE_TEST(TIMEOUTFAULT0003, "Nested timeout fault", test_timeout_fault_nested_servers,
-            config_set(CONFIG_KERNEL_MCS)&& !config_set(CONFIG_SIMULATION))
+            config_set(CONFIG_KERNEL_MCS) && !config_set(CONFIG_SIMULATION))
 
 static void vm_enter(void)
 {

Thanks, astyle.

@lsf37

lsf37 commented Jun 3, 2026

Copy link
Copy Markdown
Member

Super annoying. It's possible that it's failing to parse this properly, because it's inside a macro and there is no real actual syntactic C context that it is parsing the expression in (it's basically random text between function definitions). Not sure that helps us anything, though.

If all else fails, we can just merge it with failing style test. It will keep complaining in the future, of course.

@midnightveil

Copy link
Copy Markdown
Contributor Author

If all else fails, we can just merge it with failing style test. It will keep complaining in the future, of course.

Yes, unfortunately. Though this seems to have been already the case pre-this PR...

@lsf37
lsf37 merged commit 60b7b47 into master Jun 3, 2026
23 of 24 checks passed
@lsf37
lsf37 deleted the julia/simulation-includes branch June 3, 2026 04:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants