tests: conditionalize candperms ~gl
Sonata ISA versions do support this so disable the test and show a message instead.
diff --git a/sdk/boards/sonata-0.2.json b/sdk/boards/sonata-0.2.json
index 63b6657..3b78434 100644
--- a/sdk/boards/sonata-0.2.json
+++ b/sdk/boards/sonata-0.2.json
@@ -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",
diff --git a/sdk/boards/sonata-prerelease.json b/sdk/boards/sonata-prerelease.json
index 115f111..83f2211 100644
--- a/sdk/boards/sonata-prerelease.json
+++ b/sdk/boards/sonata-prerelease.json
@@ -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" : [
diff --git a/tests/misc-test.cc b/tests/misc-test.cc
index e39b1e5..3df4689 100644
--- a/tests/misc-test.cc
+++ b/tests/misc-test.cc
@@ -268,6 +268,7 @@
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
@@ -278,6 +279,10 @@
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()
