gitlab-ci: changed test execution, reduced apt deps

This commit is contained in:
Nick 2018-06-18 16:46:17 +02:00
parent 74189d6caf
commit b28678831d

View File

@ -34,7 +34,7 @@ build:deb_armhf:
stage: build stage: build
before_script: before_script:
- apt update -qq - 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: script:
- mkdir output.dir/ - mkdir output.dir/
- cd output.dir - cd output.dir
@ -46,7 +46,7 @@ build:deb_x86:
stage: build stage: build
before_script: before_script:
- apt update -qq - 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: script:
- mkdir output.dir/ - mkdir output.dir/
- cd output.dir - cd output.dir
@ -60,17 +60,17 @@ test_x86:
#https://forum.gitlab.com/t/testing-copy-yaml-file-to-build-folder/8309 #https://forum.gitlab.com/t/testing-copy-yaml-file-to-build-folder/8309
before_script: before_script:
- apt update -qq - apt update -qq
- apt install -y -qq build-essential pkg-config cmake - apt install -y -qq --no-install-recommends build-essential pkg-config cmake
- apt install -y -qq python-dev python-pip python-setuptools socat - apt install -y -qq --no-install-recommends python-dev python-pip python-setuptools socat
- python -m pip install pymodbus service_identity twisted - python -m pip install pymodbus service_identity twisted
dependencies: dependencies:
- build:deb_x86 - build:deb_x86
script: script:
- mkdir -p output.dir/ - mkdir -p output.dir/ && cd $_
- cd output.dir
- cmake ../ - cmake ../
- make - make
# execute all tests # 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