colin/bubblewrap
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable test-specifying-pidns.sh under 'meson dist' while I investigate

Browse Source 
This test is hanging when run under 'meson dist' for some reason, but
not when run under 'meson test', and not locally, only in the Github
Workflow-based CI. Disable it for now.

Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2022-02-19 15:41:24 +00:00
parent f4a00b4f27
commit 2e3d6e7dc7
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check.yml vendored
View File

@@ -110,7 +110,7 @@ jobs:
( cd DESTDIR && find -ls ) ( cd DESTDIR && find -ls )
- name: dist - name: dist
run: | run: |
BWRAP_MUST_WORK=1 meson dist -C _build BWRAP_MUST_WORK=1 CI_MESON_DIST=1 meson dist -C _build
- name: Collect dist test logs on failure - name: Collect dist test logs on failure
if: failure() if: failure()
run: mv _build/meson-private/dist-build/meson-logs/testlog.txt test-logs/disttestlog.txt || true run: mv _build/meson-private/dist-build/meson-logs/testlog.txt test-logs/disttestlog.txt || true

2
tests/test-specifying-pidns.sh
View File

@@ -10,6 +10,8 @@ echo "1..1"
# This test needs user namespaces # This test needs user namespaces
if test -n "${bwrap_is_suid:-}"; then if test -n "${bwrap_is_suid:-}"; then
echo "ok - # SKIP no setuid support for --unshare-user" echo "ok - # SKIP no setuid support for --unshare-user"
elif test -n "${CI_MESON_DIST:-}"; then
echo "not ok - # TODO this test hangs under 'meson dist' during Github Workflow CI"
else else
mkfifo donepipe mkfifo donepipe
$RUN --info-fd 42 --unshare-user --unshare-pid sh -c 'readlink /proc/self/ns/pid > sandbox-pidns; cat < donepipe' >/dev/null 42>info.json & $RUN --info-fd 42 --unshare-user --unshare-pid sh -c 'readlink /proc/self/ns/pid > sandbox-pidns; cat < donepipe' >/dev/null 42>info.json &