[v6,7/7] shippable: run tests with all possible schedulers

Message ID 1519761641-21081-8-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Select scheduler+queue in runtime, basing on environment
Related show

Commit Message

Github ODP bot Feb. 27, 2018, 8 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@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: 3984ba4cd16a02e3fa98ccd432a06663de3fa993
 ** Merge commit sha: 62438643661dee1350bce73f90120c824538df8b
 **/
 .shippable.yml            | 12 ++++++++----
 scripts/shippable-post.sh |  8 +++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

Patch

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..9d59da3f8 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 ${SCHED}-${bname}
 	xsltproc --novalid cunit-to-junit.xsl "$FILE" > \
-		"$SHIPPABLE_BUILD_DIR/shippable/testresults/${bname}"
+		"$SHIPPABLE_BUILD_DIR/shippable/testresults/${SCHED}-${bname}"
 done