Targets for the portable stand-alone variant of the CheriBSD test suite by paul-metzger · Pull Request #479 · CTSRD-CHERI/cheribuild

paul-metzger · 2026-04-14T14:55:48Z

This PR contains CHERI/Morello Linux targets for a portable stand-alone variant of the CheriBSD test suite. We'd like to be able to use it on CHERI/Morello Linux for testing and to help with cataloguing design differences between the CHERI-related parts of CheriBSD's and CHERI/Morello Linux's OS interfaces.
@heshamelmatary is interested in this PR for testing.

Setup for Morello Linux:

Build the test suite: ./cheribuild.py cheri-portable-os-tests --qemu/no-use-smbd -d
Start Morello Linux in Qemu: ./cheribuild.py run-minimal-morello-linux-morello-purecap --qemu/no-use-smbd -d
The test cases are then in /opt/cheri-portable-os-tests.
This issue causes a compile time error and needs to be fixed by hand for Morello Muslc: Fix const dropping cast CHERI-Alliance/musl#3
The test suite needs to be built first in order for it to be included into the image built in the second step.
The workflow for RVY CHERI Linux is similar.

The repository with the adapted test cases is private currently, but the intention is to make it publicly available soon.

paul-metzger · 2026-04-14T15:49:25Z

After a conversation with Hesham, we want to have the binaries in a subdirectory of /opt/.

heshamelmatary · 2026-04-14T15:53:04Z

After a conversation with Hesham, we want to have the binaries in a subdirectory of /opt/.

Probably under /opt/cheri-api-tests or such?

paulmetzger · 2026-04-14T15:59:50Z

The target name is tentative -- please feel free to make suggestions.

heshamelmatary · 2026-04-15T14:19:09Z

+        # We are including cheriintrin.h for some of the definitions
+        # that are on CheriBSD in other header files. However, cheric.h
+        # and cheriintrin.h define cheri_is_subset() but a comment in
+        # cheric.h indicates that the intrinsic is still unstable. Therefore,


Is that a CheriBSD's cheric.h?

Yes, the stand-alone variant of the CheriBSD test suite includes a copy of CheriBSD's cheric.h because some test cases use macros and functions defined in it.

I removed this comment and the -Wno-error=macro-redefined that followed it and added #undef cheri_is_subset before the redefinition of cheri_is_subset in the copy of cheric.h instead.

heshamelmatary · 2026-04-15T14:20:28Z

+        # cheriintrin.h if necessary.
+        self.cross_warning_flags.append("-Wno-error=macro-redefined")
+
+        # Musl libc's endian.h causes these warnings


Probably worth bookkeepings those somewhere so that we can properly fix in musl later

Would it be useful to create matching issues in the CHERI Alliance's musl repository?

I'd say yes, and probably link it here as well https://github.com/CHERI-Alliance/linux/milestone/1
Probably also the cheric.h for Linux too?

I created an issue in the CHERI Alliance Musl repository for one of these: CHERI-Alliance/musl#8
The other's were not CHERI-related and benign. I changed the use of -W flags in the test suite repository and removed the -Wno flags from the cheribuild target.

Probably also the cheric.h for Linux too?

@heshamelmatary, cheric.h is deprecated. It may be better to not bundle cheric.h with CHERI Musl and just bundle a copy with the test cases instead, with the intention to remove it and adapt the test cases at a later point.

For things we're not sure about, I might suggest creating a local macro in the cheritest_* namespace.

@brooksdavis I’m not quite sure what you’re suggesting. Could you elaborate a little? For what would you like me to create a macro?

For non-portable macros, the test suite should define it's own version of them until and unless they are added to cheriintrin.h

heshamelmatary · 2026-04-15T14:29:40Z

+            "MACHINE_ARCH": machine_arch,
+        }
+
+    def install(self, **kwargs):


Is that needed? if it's just make install I guess the CrossCompileMakefileProjector CrossCompileAutotoolsProject parent would do that for you, without you having to define install

This tells cheribuild that the makefile is not in the root directory of the repository but in <repo_root>/cheribsdtest. This makefile and the source code will move from <repo_root>/cheribsdtest to the repository's root directory in the future.

arichardson · 2026-04-21T14:42:57Z

+
+        # Overwrite dependencies because libsys and libcompiler_rt don't exist in
+        # the CHERI/Morello Linux sysroot
+        self.make_args.set(


This seems rather awkward. I think you're bundling the makefiles so could you fix it in the source repo? Or alternatively it might make sense to write a CMake/meson based build system which should be quite simple for this small project.

Done, I fixed this in the test suite repository instead, as suggested.

The bundled makefiles are just an interim solution that will be replaced by cmake. However, these tests would be very useful to @heshamelmatary and potentially others, including work on a CI setup for the CHERI Alliance Linux repositories, and so I created this PR before replacing the makefiles with cmake.

arichardson · 2026-04-27T15:35:11Z

+    # `default_branch` is set because the build scripts assume that
+    # a git tag is checked out. In more detail ./get-version returns an
+    # empty string if main is checked out.
+    repository = GitRepository("https://gitlab.freedesktop.org/libbsd/libbsd.git", default_branch="0.12.2")


What I've done in cases like this in the past is use temporary_url_override to point it at a fork with the patch applied to avoid needing the logic for patching inside the target.

Done - I've created a patched fork of libbsd on the freedesktop GitLab instance with a view to upstreaming the patch to libbsd soon (see my comment above).

heshamelmatary · 2026-04-29T16:00:12Z

It's looking way better to me. I built and tested it locally for Morello and RVY and it's working just fine. @paul-metzger please let us know once you're ready to make the repo public, then can add it to Jenkins tests after we merge this PR

arichardson · 2026-04-29T18:21:16Z

@@ -0,0 +1,136 @@
+#
+# Copyright (c) 2025 Paul Metzger


Suggested change

# Copyright (c) 2025 Paul Metzger

# Copyright (c) 2026 Paul Metzger

Thanks, I've updated the copyright in all files.

arichardson · 2026-04-29T18:21:58Z

+from ...utils import classproperty
+
+
+class BuildCheriAPITests(CrossCompileMakefileProject):


Should we give this an explicit target name instead of the default?

E.g. cheri-portable-tests?

I've named them cheri-portable-os-tests. I think Robert would like to have OS or the like in the name.

CheriBSDtest depends on libxo which in turn depends on libmd.

This is a dependency of the stand-alone CheriBSD test suite.

Added targets for the stand-alone test suite, including flags to avoid linking with libgcc_s, which isn't available on CHERI Alliance Linux.

The installation of libcheribsdtest_dynamic failed when cross-compiling on Ubuntu because the local objcopy was used instead of CHERI LLVM's objcopy. This commit fixes this by setting the OBJCOPY environment variable. The property objcopy was add to _ClangBasedTargetInfo to support this.

The targets for Morello Linux and CHERI Linux on Morello both used the 'morello-purecap' suffix. This commit fixes this by chaning the suffix for Morello Linux targets to 'legacy-morello-purecap', as suggested by Alexander Richardson. This commit also includes a similar fix for non-purecap Morello targets.

We are now using a patched fork of libbsd with a view to merging the patch upstream.

This cambridge-morello-7.0 branch has fixes for the Morello support and should be used until all of those fixes are merged.

paul-metzger requested review from arichardson and heshamelmatary April 14, 2026 14:55

paul-metzger force-pushed the cheritest branch 3 times, most recently from bb04b69 to dc097fd Compare April 14, 2026 15:37

paul-metzger requested review from brooksdavis and jrtc27 April 14, 2026 15:47

paul-metzger force-pushed the cheritest branch 9 times, most recently from e5592d9 to f7f5463 Compare April 15, 2026 11:12

heshamelmatary reviewed Apr 15, 2026

View reviewed changes

paul-metzger force-pushed the cheritest branch 7 times, most recently from dbda961 to 6d013f7 Compare April 20, 2026 17:35

arichardson reviewed Apr 21, 2026

View reviewed changes

paul-metzger force-pushed the cheritest branch from c8f414d to 9531d9c Compare April 27, 2026 11:07

heshamelmatary reviewed Apr 27, 2026

View reviewed changes

Comment thread pycheribuild/projects/cross/cheritestsuite.py Outdated

heshamelmatary reviewed Apr 27, 2026

View reviewed changes

Comment thread pycheribuild/projects/cross/libmd.py Outdated

heshamelmatary reviewed Apr 27, 2026

View reviewed changes

Comment thread pycheribuild/projects/cross/libmd.py Outdated

paul-metzger force-pushed the cheritest branch 3 times, most recently from 78ccd1a to 38c87e0 Compare April 27, 2026 14:20

arichardson reviewed Apr 27, 2026

View reviewed changes

paul-metzger force-pushed the cheritest branch 4 times, most recently from 6c27825 to 382a91e Compare April 29, 2026 15:34

arichardson reviewed Apr 29, 2026

View reviewed changes

paul-metzger force-pushed the cheritest branch 3 times, most recently from d3086e2 to 2a11df7 Compare April 30, 2026 08:02

paul-metzger and others added 3 commits May 11, 2026 10:14

Added libmd targets

577ade6

CheriBSDtest depends on libxo which in turn depends on libmd.

Added libbsd targets

09bc465

This is a dependency of the stand-alone CheriBSD test suite.

Added libxo targets

a1d99b7

This is a dependency of the stand-alone CheriBSD test suite.

paul-metzger force-pushed the cheritest branch 2 times, most recently from cc7b8fd to ea9aed7 Compare May 11, 2026 09:58

paul-metzger added 4 commits May 11, 2026 11:26

Added stand-alone CheriBSD test suite targets

11fb945

Added targets for the stand-alone test suite, including flags to avoid linking with libgcc_s, which isn't available on CHERI Alliance Linux.

Removed the libbsd patch

6ba5dc1

We are now using a patched fork of libbsd with a view to merging the patch upstream.

paul-metzger force-pushed the cheritest branch from ea9aed7 to 6ba5dc1 Compare May 11, 2026 10:26

heshamelmatary added 2 commits June 3, 2026 12:58

Favour CHERI-Linux over Morello Linux

89a2454

CHERI-Linux: point the kernel to Cambridge branch

bbca37f

This cambridge-morello-7.0 branch has fixes for the Morello support and should be used until all of those fixes are merged.

	# Copyright (c) 2025 Paul Metzger
	# Copyright (c) 2026 Paul Metzger

		from ...utils import classproperty


		class BuildCheriAPITests(CrossCompileMakefileProject):

Conversation

paul-metzger commented Apr 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paul-metzger commented Apr 14, 2026

Uh oh!

heshamelmatary commented Apr 14, 2026

Uh oh!

paulmetzger commented Apr 14, 2026

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

paul-metzger Apr 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

paul-metzger Apr 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

paul-metzger Apr 28, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

heshamelmatary commented Apr 29, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

paul-metzger commented Apr 14, 2026 •

edited

Loading

paul-metzger Apr 16, 2026 •

edited

Loading

paul-metzger Apr 30, 2026 •

edited

Loading

paul-metzger Apr 28, 2026 •

edited

Loading