diff options
| author | Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com> | 2021-12-21 23:42:26 +0300 |
|---|---|---|
| committer | Andrei Vagin <avagin@gmail.com> | 2022-04-29 03:53:52 +0300 |
| commit | 03aff7e823cd55980750c6c306dbe6b6acd28b6a (patch) | |
| tree | 8c46863d1bed86431ef27fe3263da6fea52456e6 /scripts | |
| parent | 51e0d3e29f9207e6e95eece02ba98ca1978cf945 (diff) | |
Revert "ci: disable glibc rseq support"
Let's see how rseq() C/R feature works
This reverts commit d99def7dcfa938918368c91021f72a77f738bc61.
Signed-off-by: Alexander Mikhalitsyn <alexander.mikhalitsyn@virtuozzo.com>
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, 1 insertions, 9 deletions
diff --git a/scripts/build/Dockerfile.fedora.tmpl b/scripts/build/Dockerfile.fedora.tmpl index fd4ba4aef..9d3bb0f87 100644 --- a/scripts/build/Dockerfile.fedora.tmpl +++ b/scripts/build/Dockerfile.fedora.tmpl @@ -1,8 +1,5 @@ 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 0eb065143..216c84505 100755 --- a/scripts/ci/run-ci-tests.sh +++ b/scripts/ci/run-ci-tests.sh @@ -255,12 +255,7 @@ 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 - -# 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 +make -C test/others/rpc/ run ./test/zdtm.py run -t zdtm/static/env00 --sibling |