From 98c899b1606f804089449121b9a7a359fb380952 Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周一, 04 5月 2020 11:20:41 +0800
Subject: [PATCH] older version of boost seem have issues with arguments containing commas
---
.travis.yml | 20 ++++++++++++--------
test/functional/standard-license_test.cpp | 4 ++++
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index bb1d821..8cb17ec 100644
--- a/.travis.yml
+++ b/.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,13 +142,13 @@
- 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"
env:
- - CTEST_OUTPUT_ON_FAILURE=1
- - WINEARCH=win64
+ - CTEST_OUTPUT_ON_FAILURE=1
+ - WINEARCH=win64
addons:
apt:
packages:
@@ -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:
@@ -258,11 +262,11 @@
on:
branch: develop
env:
- - CTEST_OUTPUT_ON_FAILURE=1
+ - CTEST_OUTPUT_ON_FAILURE=1
before_script:
- - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install ..
script:
- - cmake --build . --target install --config Release
- - ctest -C Release
+ - cmake --build . --target install --config Release
+ - ctest -C Release
\ No newline at end of file
diff --git a/test/functional/standard-license_test.cpp b/test/functional/standard-license_test.cpp
index 97608a1..c163212 100644
--- a/test/functional/standard-license_test.cpp
+++ b/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");
--
Gitblit v1.9.1