Merge branch 'ci' into 'master'

Fix CI error checking

See merge request !271

.gitlab-ci.yml

@@ -7,11 +7,11 @@ ops_test:
   only:
     - master
   script:
-    - tools/bazel-adb-run.sh //mace/ops:ops_test
+    - FAILURE_PATTERN="FAILED" tools/bazel-adb-run.sh //mace/ops:ops_test
 
 ops_benchmark:
   stage: ops_benchmark
   only:
     - master
   script:
-    - tools/bazel-adb-run.sh //mace/ops:ops_benchmark
+    - FAILURE_PATTERN="Aborted" tools/bazel-adb-run.sh //mace/ops:ops_benchmark

tools/bazel-adb-run.sh

@@ -61,5 +61,13 @@ for device in `adb devices | grep "^[A-Za-z0-9]\+[[:space:]]\+device$"| cut -f1`
   adb -s ${device} shell "mkdir -p $DEVICE_PATH"
   adb -s ${device} shell "mkdir -p $DEVICE_PATH/cl"
   adb -s ${device} push $BAZEL_BIN_PATH/$BIN_NAME $DEVICE_PATH && \
-  adb -s ${device} shell "MACE_OPENCL_PROFILING=$PROFILING MACE_KERNEL_PATH=$DEVICE_CL_PATH MACE_CPP_MIN_VLOG_LEVEL=$VLOG_LEVEL $DEVICE_PATH/$BIN_NAME $@"
+  TEST_LOG_FILE=`tempfile`
+  adb -s ${device} shell "MACE_OPENCL_PROFILING=$PROFILING MACE_KERNEL_PATH=$DEVICE_CL_PATH MACE_CPP_MIN_VLOG_LEVEL=$VLOG_LEVEL $DEVICE_PATH/$BIN_NAME $@" | tee $TEST_LOG_FILE 
+  if [ ! -z "$FAILURE_PATTERN" ]; then
+    grep "$FAILURE_PATTERN" $TEST_LOG_FILE > /dev/null
+    if [ $? -eq 0 ]; then
+      exit 1
+    fi
+  fi
+  rm $TEST_LOG_FILE
 done