Fixing Jenkins tests
This commit is contained in:
parent
597abb4ad6
commit
955d06d3bf
|
|
@ -19,14 +19,14 @@ pipeline {
|
||||||
stage("${implementation} ${test}") {
|
stage("${implementation} ${test}") {
|
||||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||||
sh "timeout 600 docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.test ."
|
sh "timeout 600 docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.test ."
|
||||||
sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make COMPILE_R7RS=${implementation} TESTNAME=primitives test-compile-r7rs\""
|
sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make SCHEME=${implementation} TEST=primitives test\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
stage("${implementation} snow-chibi install test") {
|
stage("${implementation} snow-chibi install test") {
|
||||||
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
|
||||||
sh "timeout 600 docker build --build-arg COMPILE_R7RS=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ."
|
sh "timeout 600 docker build --build-arg SCHEME=${implementation} --tag=r7rs-pffi-test-${implementation} -f dockerfiles/Dockerfile.snow-chibi-install-test ."
|
||||||
sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make build install-jenkins COMPILE_R7RS=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && COMPILE_R7RS=${implementation} compile-r7rs -o hello hello.scm && ./hello\""
|
sh "timeout 600 docker run -v ${WORKSPACE}:/workdir -w /workdir -t r7rs-pffi-test-${implementation} sh -c \"make build install-jenkins SCHEME=${implementation} && cp tests/hello.scm /tmp/ && cd /tmp && SCHEME=${implementation} compile-r7rs -o hello hello.scm && ./hello\""
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
ARG COMPILE_R7RS=chibi
|
ARG SCHEME=chibi
|
||||||
FROM schemers/${COMPILE_R7RS}
|
FROM schemers/${SCHEME}
|
||||||
RUN apt-get update && apt-get install -y \
|
RUN apt-get update && apt-get install -y \
|
||||||
build-essential \
|
build-essential \
|
||||||
git \
|
git \
|
||||||
|
|
@ -16,5 +16,5 @@ RUN chicken-install r7rs
|
||||||
RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
|
RUN git clone https://gitea.scheme.org/Retropikzel/compile-r7rs.git --depth=1
|
||||||
RUN cd compile-r7rs && make && make install
|
RUN cd compile-r7rs && make && make install
|
||||||
ARG COMPILE_R7RS=chibi
|
ARG COMPILE_R7RS=chibi
|
||||||
ENV COMPILE_R7RS=${COMPILE_R7RS}
|
ENV COMPILE_R7RS=${SCHEME}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue