diff options
| author | Radostin Stoyanov <rstoyanov@fedoraproject.org> | 2021-12-17 06:01:49 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2022-04-29 03:53:52 +0300 |
| commit | 119a7988568ede335ce03d86ef404b4ea6820b62 (patch) | |
| tree | 21190c36b287740e4d51f42f67d4edf76b5bfedb /scripts | |
| parent | 9fd000c58d41b99687eb9ae0279cf11896477977 (diff) | |
ci: disable glibc rseq support
This patch sets the glibc.pthread.rseq tunable [1] to disable rseq
support in glibc as a temporary solution for the problem described in
[2]. This would allow us to run CI tests until CRIU has rseq support.
This commit also disables the rpc tests as they fail even
when GLIBC_TUNABLES is set.
[1] https://sourceware.org/git/?p=glibc.git;a=commit;h=e3e589829d16af9f7e73c7b70f74f3c5d5003e45
[2] https://github.com/checkpoint-restore/criu/issues/1696
Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/Dockerfile.fedora.tmpl | 3 | ||||
| -rwxr-xr-x | scripts/ci/run-ci-tests.sh | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl index 9d3bb0f87..fd4ba4aef 100644 --- a/scripts/build/Dockerfile.fedora.tmpl +++ b/scripts/build/Dockerfile.fedora.tmpl @@ -1,5 +1,8 @@ ARG CC=gcc +# FIXME: Temporary solution for https://github.com/checkpoint-restore/criu/issues/1696 +ENV GLIBC_TUNABLES=glibc.pthread.rseq=0 + COPY scripts/ci/prepare-for-fedora-rawhide.sh /bin/prepare-for-fedora-rawhide.sh RUN /bin/prepare-for-fedora-rawhide.sh diff --git a/scripts/ci/run-ci-tests.sh b/scripts/ci/run-ci-tests.sh index 096f907fb..bf7331142 100755 --- a/scripts/ci/run-ci-tests.sh +++ b/scripts/ci/run-ci-tests.sh @@ -235,7 +235,12 @@ if [ -n "$TRAVIS" ] || [ -n "$CIRCLECI" ]; then # Error (criu/tty.c:1014): tty: Don't have tty to inherit session from, aborting make -C test/others/shell-job/ run fi -make -C test/others/rpc/ run + +# FIXME: rpc tests fail even with set glibc tunable +# https://github.com/checkpoint-restore/criu/issues/1696 +if [ "$GLIBC_TUNABLES" != "glibc.pthread.rseq=0" ]; then + make -C test/others/rpc/ run +fi ./test/zdtm.py run -t zdtm/static/env00 --sibling |