From 0056a7f39ed3ffd8876089ccf798ef143db57638 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Thu, 6 May 2021 16:44:47 +0800 Subject: [PATCH] test --- .drone.yml | 19 ++++++++++++++----- tests/test-all.sh | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 926883b0ba..5d997560d4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,6 +7,19 @@ platform: arch: amd64 steps: +- name: build + image: gcc + commands: + - apt-get update + - apt-get install -y cmake build-essential + - mkdir debug + - cd debug + - cmake .. + - make + when: + branch: + - develop + - master - name: smoke_test image: python:3.8 @@ -16,11 +29,7 @@ steps: - pip3 install psutil - pip3 install guppy3 - pip3 install src/connector/python/linux/python3/ - - mkdir debug - - cd debug - - cmake .. - - make - - cd ../tests + - cd tests - ./test-all.sh smoke when: branch: diff --git a/tests/test-all.sh b/tests/test-all.sh index 997894c509..47e5de6aa0 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -66,7 +66,7 @@ function runSimCaseOneByOne { echo -e "${RED} failed${NC}" | tee -a out.log else echo -n $case - ./test.sh -f $case && \ + ./test.sh -f $case > /dev/null 2>&1 && \ ( grep -q 'script.*'$case'.*failed.*, err.*lineNum' ../../sim/tsim/log/taoslog0.0 && echo -e "${RED} failed${NC}" | tee -a out.log || echo -e "${GREEN} success${NC}" | tee -a out.log )|| \ ( grep -q 'script.*success.*m$' ../../sim/tsim/log/taoslog0.0 && echo -e "${GREEN} success${NC}" | tee -a out.log ) || \ echo -e "${RED} failed${NC}" | tee -a out.log -- GitLab