Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: conditionalize candperms ~gl #416

Merged
merged 1 commit into from
Jan 21, 2025
Merged

tests: conditionalize candperms ~gl #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sdk/boards/sonata-0.2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,8 @@
"SUNBURST_SHADOW_SIZE=0x4000",
"DEFAULT_UART_BAUD_RATE=115200",
"ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM=1",
"ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM=1"
"ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM=1",
"CHERIOT_NO_SAIL_83"
],
"driver_includes" : [
"../include/platform/sunburst/v0.2",
Expand Down
3 changes: 2 additions & 1 deletion sdk/boards/sonata-prerelease.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"SUNBURST_SHADOW_BASE=0x30000000",
"SUNBURST_SHADOW_SIZE=0x800",
"ipconfigDRIVER_INCLUDED_RX_IP_CHECKSUM=1",
"ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM=1"
"ipconfigDRIVER_INCLUDED_TX_IP_CHECKSUM=1",
"CHERIOT_NO_SAIL_83"
],
"cxflags": "-mllvm -enable-machine-outliner=never",
"driver_includes" : [
Expand Down
5 changes: 5 additions & 0 deletions tests/misc-test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ void check_sealed_scoping()
o.permissions().without(Permission::Global),
"Loading global sealed cap through non-LoadGlobal bad perms");

#ifndef CHERIOT_NO_SAIL_83
/*
* Use CAndPerm to shed Global from our o cap.
* Spell this a little oddly to make sure we get CAndPerm with a mask of
Expand All @@ -278,6 +279,10 @@ void check_sealed_scoping()
oLocal2.without_permissions(Permission::Global);

TEST_EQUAL(oLocal2, OLocal1, "CAndPerm ~GL gone wrong");
#else
debug_log(
"Skipping test for cheriot-sail#83 because the ISA version is too old.");
#endif
}

int test_misc()
Expand Down
Loading