Skip to content

Commit 95284c6

Browse files
committed
Reduce optimization level on risc-v / ubuntu.
Wait on risv longer to account for a slower emulation.
1 parent ac61ec4 commit 95284c6

2 files changed

Lines changed: 11 additions & 2 deletions

File tree

docker/Dockerfile.voiptests

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ ENV PYTHON_CMD=python3
3535
RUN ${PYTHON_CMD} -m pip install --upgrade setuptools
3636
RUN ${PYTHON_CMD} setup.py sdist
3737
RUN ${PYTHON_CMD} -m pip install dist/sippy*.gz
38-
RUN env -S "`${SET_ENV}`" \
38+
RUN eval "`${SET_ENV}`" && \
3939
${PYTHON_CMD} -m pip install rtp.io
4040

4141
ENV MM_TYPE=b2bua

docker/set_env.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,17 @@ platformopts() {
3939
fexport TEST_SET_MIGHTFAIL=early_cancel_lost100,early_cancel
4040
;;
4141
linux/riscv64)
42-
fexport MM_INIT_DELAY=6
4342
fexport TEST_SET_MIGHTFAIL=early_cancel_lost100,early_cancel
43+
case "${OS_TAG}" in
44+
ubuntu)
45+
fexport 'CFLAGS_opt="-O1 -g3 -pipe -flto"'
46+
fexport MM_WAITREADY=10
47+
fexport MM_INIT_DELAY=12
48+
;;
49+
*)
50+
fexport MM_INIT_DELAY=6
51+
;;
52+
esac
4453
;;
4554
esac
4655
fexport 'EXTRA_PACKAGES="build-essential libunwind-dev git python3-dev cmake ninja-build patchelf"'

0 commit comments

Comments
 (0)