Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit 1dda317

Browse files
author
Matthias Koeppe
committed
Add cmake to packages not tested
1 parent 7b3446f commit 1dda317

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

build/bin/write-dockerfile.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ ARG NUMPROC=8
179179
ENV MAKE="make -j\${NUMPROC}"
180180
ARG USE_MAKEFLAGS="-k V=0"
181181
ENV SAGE_CHECK=warn
182-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
182+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake"
183183
#:toolchain:
184184
$RUN make \${USE_MAKEFLAGS} base-toolchain
185185
@@ -188,7 +188,7 @@ ARG NUMPROC=8
188188
ENV MAKE="make -j\${NUMPROC}"
189189
ARG USE_MAKEFLAGS="-k V=0"
190190
ENV SAGE_CHECK=warn
191-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
191+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake"
192192
#:make:
193193
ARG TARGETS_PRE="sagelib-build-deps"
194194
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_PRE}
@@ -198,7 +198,7 @@ ARG NUMPROC=8
198198
ENV MAKE="make -j\${NUMPROC}"
199199
ARG USE_MAKEFLAGS="-k V=0"
200200
ENV SAGE_CHECK=warn
201-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
201+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake"
202202
ADD src src
203203
ARG TARGETS="build"
204204
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS}
@@ -208,7 +208,7 @@ ARG NUMPROC=8
208208
ENV MAKE="make -j\${NUMPROC}"
209209
ARG USE_MAKEFLAGS="-k V=0"
210210
ENV SAGE_CHECK=warn
211-
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl"
211+
ENV SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake"
212212
ARG TARGETS_OPTIONAL="ptest"
213213
$RUN make SAGE_SPKG="sage-spkg -y -o" \${USE_MAKEFLAGS} \${TARGETS_OPTIONAL} || echo "(error ignored)"
214214

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ commands =
364364
docker: done'
365365
# pathpy checksuite needs tox. #28728: gap fails its test suite.
366366
# linbox/cysignals testsuites fail. ppl takes very long.
367-
local: bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP:./bootstrap} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
367+
local: bash -c 'export PATH={env:PATH} && {env:SETENV} && {env:BOOTSTRAP:./bootstrap} && ./configure --prefix={envdir}/local {env:CONFIGURE_ARGS} && make -k V=0 base-toolchain && make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_PRE:} {posargs:build} && (make -k V=0 SAGE_SPKG="sage-spkg -y -o" SAGE_CHECK=warn SAGE_CHECK_PACKAGES="!cython,!r,!python3,!python2,!nose,!pathpy,!gap,!cysignals,!linbox,!git,!ppl,!cmake" {env:TARGETS_OPTIONAL:} || echo "(error ignored)" ) '
368368

369369
[testenv:check_configure]
370370
## Test that configure behaves properly

0 commit comments

Comments
 (0)