From b28678831dd22231fa3de46221e7793c31fe23d1 Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 18 Jun 2018 16:46:17 +0200 Subject: [PATCH] gitlab-ci: changed test execution, reduced apt deps --- .gitlab-ci.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a7f0c2..ff5e932 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,7 +34,7 @@ build:deb_armhf: stage: build before_script: - apt update -qq - - apt install -y -qq build-essential pkg-config cmake gcc-arm-linux-gnueabihf + - apt install -y -qq --no-install-recommends build-essential pkg-config cmake gcc-arm-linux-gnueabihf script: - mkdir output.dir/ - cd output.dir @@ -46,7 +46,7 @@ build:deb_x86: stage: build before_script: - apt update -qq - - apt install -y -qq build-essential pkg-config cmake + - apt install -y -qq --no-install-recommends build-essential pkg-config cmake script: - mkdir output.dir/ - cd output.dir @@ -60,17 +60,17 @@ test_x86: #https://forum.gitlab.com/t/testing-copy-yaml-file-to-build-folder/8309 before_script: - apt update -qq - - apt install -y -qq build-essential pkg-config cmake - - apt install -y -qq python-dev python-pip python-setuptools socat + - apt install -y -qq --no-install-recommends build-essential pkg-config cmake + - apt install -y -qq --no-install-recommends python-dev python-pip python-setuptools socat - python -m pip install pymodbus service_identity twisted dependencies: - build:deb_x86 script: - - mkdir -p output.dir/ - - cd output.dir + - mkdir -p output.dir/ && cd $_ - cmake ../ - make # execute all tests - - make VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=1 test + - (cd ../ && python tests/run_itests.py output.dir/mbusd) + #- make VERBOSE=1 CTEST_OUTPUT_ON_FAILURE=1 test