From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 467 (lumag:sched-env)
 ** https://github.com/Linaro/odp/pull/467
 ** Patch: https://github.com/Linaro/odp/pull/467.patch
 ** Base sha: d5419e8857b2bc61d3be17fe53f171550fee426b
 ** Merge commit sha: e203ffe9c0a48b78cb0d0f4aadbb16bb1f840b3c
 **/
 .shippable.yml            | 12 ++++++++----
 scripts/shippable-post.sh |  8 +++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.shippable.yml b/.shippable.yml
index 6b2a73c3f..c01e3608e 100644
--- a/.shippable.yml
+++ b/.shippable.yml
@@ -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
diff --git a/scripts/shippable-post.sh b/scripts/shippable-post.sh
index ed5a44168..1fc3563f4 100755
--- a/scripts/shippable-post.sh
+++ b/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

Reply via email to