gcontini
2020-05-04 72555a6569db7ae977fa80aac42b900d96ffdb6d
older version of boost seem have issues with arguments containing commas
2个文件已修改
12 ■■■■ 已修改文件
.travis.yml 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
test/functional/standard-license_test.cpp 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.travis.yml
@@ -60,6 +60,8 @@
         - ctest -T memcheck    
   - os: linux
     dist: xenial
     env:
     - CTEST_OUTPUT_ON_FAILURE=1
     name: "Ubuntu 16.04 - Travis CI VM"
     addons:
        apt:
@@ -124,7 +126,7 @@
        - docker commit centos7_toconfigure centos7_configured
     script: 
        - docker run --name centos7_make -v `pwd`:/root/open-license-manager centos7_configured /bin/bash -c 
            "cd /root/open-license-manager/build && make && make install && VIRTUAL_ENV=CONTAINER make test"
            "cd /root/open-license-manager/build && make && make install && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=CONTAINER make test"
   - os: linux
     dist: bionic
     name: "CentOS-8 Docker"
@@ -140,7 +142,7 @@
        - docker commit centos8_toconfigure centos8_configured
     script: 
        - docker run --name centos8_make -v `pwd`:/root/open-license-manager centos8_configured /bin/bash -c \
            "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && VIRTUAL_ENV=DOCKER make test"
            "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && CTEST_OUTPUT_ON_FAILURE=1 VIRTUAL_ENV=DOCKER make test"
   - os: linux
     dist: bionic
     name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
@@ -174,6 +176,8 @@
        - cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-ubuntu-mingw64.cmake -DCMAKE_INSTALL_PREFIX=../../install -DBOOST_ROOT=$PWD/boost_1_71_0/dist -DOPENSSL_ROOT_DIR=$PWD/openssl-1.0.2h-win64-mingw/ ..
   - os: windows
     name: "Widnows server 1803 - Visual Studio 15 2017 Win64 - (/MD)"
     env:
     - CTEST_OUTPUT_ON_FAILURE=1
     cache:
         edge: true
         directories:
test/functional/standard-license_test.cpp
@@ -72,6 +72,8 @@
}
*/
// old boost version can't parse the comma separated list.. only centos 7 and Ubuntu 16.04
#if (BOOST_VERSION > 106500)
BOOST_AUTO_TEST_CASE(multiple_features) {
    vector<string> extraArgs;
    extraArgs.push_back("-f");
@@ -95,6 +97,8 @@
    result = acquire_license(&callInfo, &location, &license);
    BOOST_CHECK_EQUAL(result, LCC_EVENT_TYPE::PRODUCT_NOT_LICENSED);
}
#endif
//
// BOOST_AUTO_TEST_CASE( hw_identifier ) {
//    const string licLocation(PROJECT_TEST_TEMP_DIR "/hw_identifier.lic");