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

Fix CI not failing #95

Merged
merged 1 commit into from
Apr 10, 2024
Merged

Fix CI not failing #95

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
6 changes: 3 additions & 3 deletions .buildbot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ args=(
)
export BUILDBOT_PLATFORM=riscv64-purecap
args=${args[@]}
script -O /dev/null -c "python3 tests/run_cheri_examples.py $args"
script -O /dev/null -ec "python3 tests/run_cheri_examples.py $args"

echo "Running tests for 'morello-hybrid' using QEMU..."
args=(
Expand All @@ -66,7 +66,7 @@ args=(
)
export BUILDBOT_PLATFORM=morello-hybrid
args=${args[@]}
script -O /dev/null -c "python3 tests/run_cheri_examples.py $args"
script -O /dev/null -ec "python3 tests/run_cheri_examples.py $args"

echo "Running tests for 'morello-purecap' using QEMU..."
args=(
Expand All @@ -82,4 +82,4 @@ args=(
)
export BUILDBOT_PLATFORM=morello-purecap
args=${args[@]}
script -O /dev/null -c "python3 tests/run_cheri_examples.py $args"
script -O /dev/null -ec "python3 tests/run_cheri_examples.py $args"
5 changes: 3 additions & 2 deletions cap_build.c → hybrid/cap_build.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
// from the first argument --- which differentiates `cheri_address_set` and
// `cheri_cap_build`.

#include "cheriintrin.h"
#include "include/common.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>

#include "../include/common.h"
#include "cheriintrin.h"

int main()
{
// This example relies on morello-specific symbols, so we won't run
Expand Down
6 changes: 3 additions & 3 deletions tests/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ elif [ "$1" = "morello-hybrid" ]; then
run to_fail hybrid/compartment_examples/inter_comp_call/malicious_compartments inter_comp_call-secure-redirect_clr
run to_fail hybrid/compartment_examples/inter_comp_call/malicious_compartments inter_comp_call-secure-update_ddc
# Tests that should pass
run OK . cap_build
run OK compare_platforms compare_platforms_overflow
run OK hybrid/ddc_compartment_switching ddc_compartment_switching
run OK example_allocators/compartment_alloc main
run OK hybrid basic_ddc
run OK hybrid cap_build
run OK hybrid/compartment_examples/inter_comp_call/base main
run OK hybrid/compartment_examples/inter_comp_call/malicious_compartments inter_comp_call-secure
run OK hybrid/ddc_compartment_switching ddc_compartment_switching
run OK syscall-restrict syscall-restrict
run OK example_allocators/compartment_alloc main
else
echo "$1 not recognised."
exit 1
Expand Down