@@ -41,10 +41,14 @@ build:
- if [ "${CC#clang}" != "${CC}" ] ; then export CXX="${CC/clang/clang++}"; fi
- ./configure $CONF
- make -j $(nproc)
- - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes make check -k
-
- on_success:
- - ./scripts/shippable-post.sh
+ - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=basic make check
+ - ./scripts/shippable-post.sh basic
+ - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=sp make check
+ - ./scripts/shippable-post.sh sp
+ - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=iquery make check
+ - ./scripts/shippable-post.sh iquery
+ - sudo env ODP_SHM_DIR=/dev/shm/odp ODP_TEST_OUT_XML=yes ODP_SCHEDULER=scalable make check
+ - ./scripts/shippable-post.sh scalable
on_failure:
- ./scripts/shippable-post.sh
@@ -2,8 +2,14 @@
wget https://raw.githubusercontent.com/shawnliang/cunit-to-junit/master/cunit-to-junit.xsl
+mkdir -p "$SHIPPABLE_BUILD_DIR/shippable/testresults"
+
+SCHED=${1:-default}
+echo $SCHED
+
for FILE in `find ./test ./platform/ -name "*.xml"`; do
bname="`basename $FILE`";
+ echo Processing $FILE as ${SHED}-${bname}
xsltproc --novalid cunit-to-junit.xsl "$FILE" > \
- "$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}"
+ "$SHIPPABLE_BUILD_DIR/shippable/testresults/${SHED}-${bname}"
done