From 1febc26adc037995e3ea01b765213d22a348db0d Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周日, 03 5月 2020 21:44:03 +0800
Subject: [PATCH] issue #77
---
src/library/LicenseReader.cpp | 2 +-
test/functional/generate-license.cpp | 2 +-
.travis.yml | 29 +++++++++++++++++++++++++++--
3 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index c2099b6..bb1d821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,8 +31,33 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
- - src/inspector/lccinspector
- - ctest -T memcheck
+ - ctest -T memcheck
+ - os: linux
+ dist: bionic
+ name: "Ubuntu 18.04 - VM - set LCC_PROJECT_NAME"
+ env:
+ - VIRTUAL_ENV=VM
+ - CTEST_OUTPUT_ON_FAILURE=1
+ addons:
+ apt:
+ packages:
+ - cmake
+ - valgrind
+ - libssl-dev
+ - zlib1g-dev
+ - libboost-dev
+ - libboost-test-dev
+ - libboost-filesystem-dev
+ - libboost-iostreams-dev
+ - libboost-program-options-dev
+ - libboost-system-dev
+ - libboost-thread-dev
+ - libboost-date-time-dev
+ before_script:
+ - cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON -DLCC_PROJECT_NAME=MYPROJECT ..
+ script:
+ - cmake --build . --target install
+ - ctest -T memcheck
- os: linux
dist: xenial
name: "Ubuntu 16.04 - Travis CI VM"
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 5d071c3..47f006e 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -112,7 +112,7 @@
ostringstream oss;
oss << toupper_copy(trim_copy(m_project));
for (auto &it : m_limits) {
- if (it.first != LICENSE_VERSION && it.first != LICENSE_SIGNATURE) {
+ if (it.first != LICENSE_SIGNATURE) {
oss << trim_copy(it.first) << trim_copy(it.second);
}
}
diff --git a/test/functional/generate-license.cpp b/test/functional/generate-license.cpp
index 59e55ae..ae42689 100644
--- a/test/functional/generate-license.cpp
+++ b/test/functional/generate-license.cpp
@@ -49,7 +49,7 @@
cout << "executing :" << ss.str() << endl;
const int retCode = std::system(ss.str().c_str());
BOOST_CHECK_EQUAL(retCode, 0);
- BOOST_ASSERT(fs::exists(license_fname));
+ BOOST_ASSERT_MSG(fs::exists(license_fname), "license exists");
CSimpleIniA ini;
const SI_Error rc = ini.LoadFile(license_fname.c_str());
BOOST_CHECK_GE(rc, 0);
--
Gitblit v1.9.1