From: Maxim Uvarov <maxim.uva...@linaro.org> Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org> --- /** Email created from pull request 309 (muvarov:devel/master_shippable2) ** https://github.com/Linaro/odp/pull/309 ** Patch: https://github.com/Linaro/odp/pull/309.patch ** Base sha: 6881620135a179911a5839d4be97423a8d80e5ab ** Merge commit sha: 512c8ed3c8a8e6317575378fbccc1620392cca8a **/ .shippable.yml | 8 +++++++- scripts/Dockerfile | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.shippable.yml b/.shippable.yml index 9fbb29190..bdffd6be2 100644 --- a/.shippable.yml +++ b/.shippable.yml @@ -36,9 +36,15 @@ build: - sudo mount -t hugetlbfs nodev /mnt/huge - mkdir -p /dev/shm/odp - ./bootstrap - - ./configure --disable-test-perf + - ./configure --disable-test-perf --enable-cunit_out_xml - make - sudo env ODP_SHM_DIR=/dev/shm/odp make check + - wget https://raw.githubusercontent.com/shawnliang/cunit-to-junit/master/cunit-to-junit.xsl + - | + for FILE in `find ./test ./platform/ -name "*.xml"`; do + bname=`basename $FILE`; + xsltproc --novalid cunit-to-junit.xsl $FILE > $SHIPPABLE_BUILD_DIR/shippable/testresults/${bname} + done on_failure: - cat config.log diff --git a/scripts/Dockerfile b/scripts/Dockerfile index b15282aaf..7e117971d 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -20,7 +20,8 @@ RUN sudo apt-get update && sudo apt-get install -yy \ libtool \ linux-headers-`uname -r` \ mscgen \ - ruby-dev + ruby-dev \ + xsltproc RUN sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 10 RUN sudo ln -s /usr/bin/clang-3.8 /usr/bin/clang