Unverified Commit a1ccf314 authored by Peter Steinbach's avatar Peter Steinbach Committed by GitHub

Merge pull request #19 from psteinb/device-name-check-depends

Device name check depends
parents efda37c0 ec985ad7
Pipeline #637 passed with stages
in 1 minute and 22 seconds
......@@ -5,8 +5,9 @@ centos_build:
script:
- mkdir build
- cd build
- cmake ..
- make
- cmake ..
- cat tests/build_machine.hpp
- make VERBOSE=1
centos_test:
stage: test
......@@ -15,9 +16,10 @@ centos_test:
script:
- mkdir build
- cd build
- cmake ..
- make
- ctest
- cmake ..
- cat tests/build_machine.hpp
- make VERBOSE=1
- ctest -V
mac_build:
stage: build
......@@ -26,8 +28,9 @@ mac_build:
script:
- mkdir build
- cd build
- cmake ..
- make
- cmake ..
- cat tests/build_machine.hpp
- make VERBOSE=1
mac_test:
stage: test
......@@ -36,9 +39,10 @@ mac_test:
script:
- mkdir build
- cd build
- cmake ..
- make
- ctest
- cmake ..
- cat tests/build_machine.hpp
- make VERBOSE=1
- ctest -V
ubuntu_build:
stage: build
......@@ -47,8 +51,9 @@ ubuntu_build:
script:
- mkdir build
- cd build
- cmake ..
- make
- cmake ..
- cat tests/build_machine.hpp
- make VERBOSE=1
win_build:
stage: build
......@@ -58,6 +63,7 @@ win_build:
- mkdir build
- cd build
- cmake ..
- type tests\build_machine.hpp
- cmake --build .
win_test:
......@@ -68,6 +74,7 @@ win_test:
- mkdir build
- cd build
- cmake ..
- type tests\build_machine.hpp
- cmake --build . --config Release
- ctest -C Release
- ctest -V -C Release
[![Build Status](https://travis-ci.org/psteinb/compass.svg?branch=master)](https://travis-ci.org/psteinb/compass)
[![Build status](https://ci.appveyor.com/api/projects/status/dvgk88ynuuvx1ldi/branch/master?svg=true)](https://ci.appveyor.com/project/psteinb/compass/branch/master)
[![pipeline status](https://git.mpi-cbg.de/steinbac/compass-github-pull/badges/master/pipeline.svg)](https://git.mpi-cbg.de/steinbac/compass-github-pull/commits/master)
# compass
......
......@@ -38,9 +38,15 @@ TEST_CASE_METHOD( host_reference, "machine_specific" ){
SECTION( "device_name_right" ){
auto value = compass::runtime::device_name();
REQUIRE(value.empty()!=true);
REQUIRE_THAT(value, Catch::Matchers::Contains(expected_device_name) );
auto brand = compass::runtime::brand();
if(expected_device_name.size()>0){
REQUIRE(value.size() == expected_device_name.size());
REQUIRE_THAT(value, Catch::Matchers::Contains(expected_device_name) );
} else {
REQUIRE(value.size()>=0);
REQUIRE(value.size() <= brand.size());
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment