Skip to content

Commit 42076ca

Browse files
committed
permit unsandoxing specific tests
1 parent d275e91 commit 42076ca

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

test.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ multicore_subset(){
7575

7676
# The following tests are not using multiple CPU's, but have been equippedd with some anyway
7777
# to make sure core functionality is not broken by missing locks etc. when waking up more cores.
78-
nix-shell ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ./test/net/integration/udp
78+
nix-shell ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ./test/net/integration/udp --arg doCheck true
7979
nix-build ./unikernel.nix --arg smp true $CCACHE_FLAG --argstr unikernel ./test/kernel/integration/paging --arg doCheck true
8080
}
8181

@@ -138,24 +138,30 @@ run_testsuite() {
138138

139139
for subfolder in "$base_folder"/*/; do
140140
local skip=false
141+
local _sandboxed=$sandboxed
141142

142143
for exclude in "${exclusion_list[@]}"; do
143144
if [[ "$subfolder" == *"$exclude"* ]]; then
144145
skip=true
145146
break
146147
fi
147148
done
148-
149149
if [ "$skip" = true ]; then
150150
continue
151151
fi
152152

153+
for unsandbox in "${unsandbox_list[@]}"; do
154+
if [[ "$subfolder" == *"$unsandbox"* ]]; then
155+
_sandboxed=false
156+
break
157+
fi
158+
done
153159

154160
# The command to run, as string to be able to print the fully expanded command
155-
if $sandboxed; then
161+
if $_sandboxed; then
156162
cmd="nix-build ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${subfolder%/} --arg doCheck true"
157163
else
158-
cmd="nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${subfolder%/}"
164+
cmd="nix-shell ./unikernel.nix $CCACHE_FLAG --argstr unikernel ${subfolder%/} --arg doCheck true"
159165
fi
160166

161167
echo ""
@@ -199,7 +205,11 @@ exclusions=(
199205
"modules" # Requires 32-bit build, which our shell.nix is not set up for
200206
)
201207

208+
unsandbox_list=(
209+
"term"
210+
)
202211
run_testsuite "./test/kernel/integration" "${exclusions[@]}"
212+
unsandbox_list=()
203213

204214
#
205215
# C++ STL runtime tests

0 commit comments

Comments
 (0)