kanaka/mal
1
1
Fork 0
mirror of https://github.com/kanaka/mal.git synced 2024-11-10 02:45:44 +03:00
Code Issues Projects Releases Wiki Activity

Travis: fix self-hosted test and error output.

Browse Source
This commit is contained in:
Joel Martin 2015-10-10 14:46:42 -05:00
parent 531a98a931
commit fbcf24ee39
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -59,12 +59,12 @@ script:
# Regular tests
- ./.travis_test.sh test ${IMPL}
- cat test.out; rm -f test.out
- cat test.err || true; rm -f test.err
# Self-hosted tests
- ./.travis_test.sh test mal ${IMPL}
- cat test.out; rm -f test.out
- cat test.err || true; rm -f test.err
# Performance tests
#- ./.travis_test.sh perf
#- cat perf.out
#- ./.travis_test.sh perf ${IMPL}
#- cat perf.err || true; rm -f perf.err

12
.travis_build.sh
View File

@ -8,18 +8,20 @@ BUILD_IMPL=${BUILD_IMPL:-${IMPL}}
# use the Travis image/tools directly.
if [ -z "${NO_DOCKER}" ]; then
impl=$(echo "${IMPL}" | tr '[:upper:]' '[:lower:]')
build_impl=$(echo "${BUILD_IMPL}" | tr '[:upper:]' '[:lower:]')
img_impl=$(echo "${BUILD_IMPL}" | tr '[:upper:]' '[:lower:]')
docker pull kanaka/mal-test-${impl}
if [ "${impl}" != "${build_impl}" ]; then
docker pull kanaka/mal-test-${build_impl}
if [ "${impl}" != "${img_impl}" ]; then
docker pull kanaka/mal-test-${img_impl}
fi
if [ "${BUILD_IMPL}" = "rpython" ]; then
# rpython often fails once per build in compute_vars_longevity
# so build it twice and ignore failures the first time
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${build_impl} make -C ${BUILD_IMPL} || true
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${img_impl} \
make -C ${BUILD_IMPL} || true
fi
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${build_impl} make -C ${BUILD_IMPL}
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${img_impl} \
make -C ${BUILD_IMPL}
else
make -C ${BUILD_IMPL}
fi

9
.travis_test.sh
View File

@ -14,11 +14,14 @@ echo "MAL_IMPL: ${MAL_IMPL}"
# use the Travis image/tools directly.
if [ -z "${NO_DOCKER}" ]; then
impl=$(echo "${IMPL}" | tr '[:upper:]' '[:lower:]')
img_impl=$(echo "${3:-${IMPL}}" | tr '[:upper:]' '[:lower:]')
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${impl} \
make TEST_OPTS="--soft --log-file ../${ACTION}.out" \
docker run -it -u $(id -u) -v `pwd`:/mal kanaka/mal-test-${img_impl} \
make TEST_OPTS="--soft --log-file ../${ACTION}.err" \
MAL_IMPL=${MAL_IMPL} ${ACTION}^${IMPL}
else
make TEST_OPTS="--soft --log-file ../${ACTION}.out" \
make TEST_OPTS="--soft --log-file ../${ACTION}.err" \
MAL_IMPL=${MAL_IMPL} ${ACTION}^${IMPL}
fi
# no failure so remove error log
rm ${ACTION}.err