From a6c81515218982340efcd6f219112e7e981783ab Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周六, 25 4月 2020 21:47:02 +0800
Subject: [PATCH] try run inspector before tests
---
src/library/os/linux/execution_environment.cpp | 18 +++++++++---------
src/library/os/execution_environment.hpp | 2 +-
.travis.yml | 4 +++-
3 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ef5ebe0..aa174d4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,6 +30,7 @@
- libboost-date-time-dev
script:
- cmake --build . --target install
+ - src/inspector/lccinspector
- ctest
- ctest -T memcheck
- os: linux
@@ -75,6 +76,7 @@
- cd build && cmake -DCMAKE_INSTALL_PREFIX=../../install -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug -DCODE_COVERAGE=ON ..
script:
- cmake --build . --target install
+ - src/inspector/lccinspector
- ctest
after_success:
# Create lcov report
@@ -112,7 +114,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 && VIRTUAL_ENV=DOCKER make test"
+ "cd /root/open-license-manager/build && make && make install && src/inspector/lccinspector && VIRTUAL_ENV=DOCKER make test"
- os: linux
dist: bionic
name: "Ubuntu 18.04 - MinGW cross-compile for Windows x64"
diff --git a/src/library/os/execution_environment.hpp b/src/library/os/execution_environment.hpp
index f52f8db..4aeb86d 100644
--- a/src/library/os/execution_environment.hpp
+++ b/src/library/os/execution_environment.hpp
@@ -35,7 +35,7 @@
~ExecutionEnvironment(){};
LCC_API_VIRTUALIZATION_SUMMARY virtualization() const;
bool is_cloud() const;
- bool is_docker() const { return m_container_type != DOCKER; }
+ bool is_docker() const { return m_container_type != CONTAINER_TYPE::DOCKER; }
// detect if it's a kind of container technology (docker or lxc)
bool is_container() const { return m_container_type != NONE; }
LCC_API_CLOUD_PROVIDER cloud_provider() const;
diff --git a/src/library/os/linux/execution_environment.cpp b/src/library/os/linux/execution_environment.cpp
index 7df96e9..a00df29 100644
--- a/src/library/os/linux/execution_environment.cpp
+++ b/src/library/os/linux/execution_environment.cpp
@@ -40,11 +40,11 @@
char *line = NULL;
size_t len = 0;
ssize_t read;
- CONTAINER_TYPE result = NONE;
+ CONTAINER_TYPE result = CONTAINER_TYPE::NONE;
fp = fopen(proc_path, "r");
if (fp == NULL) {
- return NONE;
+ return CONTAINER_TYPE::NONE;
}
while ((read = getline(&line, &len, fp)) != -1 && result == 0) {
@@ -52,10 +52,10 @@
// printf("Retrieved line of length %zu:\n", read);
// printf("%s", line);
if (strstr(line, "docker") != NULL) {
- result = DOCKER;
+ result = CONTAINER_TYPE::DOCKER;
}
if (strstr(line, "lxc") != NULL) {
- result = LXC;
+ result = CONTAINER_TYPE::LXC;
}
}
@@ -67,15 +67,15 @@
// 0=NO 1=Docker/2=Lxc
static CONTAINER_TYPE checkSystemdContainer() {
ifstream systemd_container("/var/run/systemd/container");
- CONTAINER_TYPE result = NONE;
+ CONTAINER_TYPE result = CONTAINER_TYPE::NONE;
if (systemd_container.good()) {
- result = DOCKER;
+ result = CONTAINER_TYPE::DOCKER;
for (string line; getline(systemd_container, line);) {
if (line.find("docker") != string::npos) {
- result = DOCKER;
+ result = CONTAINER_TYPE::DOCKER;
break;
} else if (line.find("lxc") != string::npos) {
- result = LXC;
+ result = CONTAINER_TYPE::LXC;
break;
}
}
@@ -85,7 +85,7 @@
static CONTAINER_TYPE get_container_type() {
CONTAINER_TYPE result = checkContainerProc();
- if (result == NONE) {
+ if (result == CONTAINER_TYPE::NONE) {
result = checkSystemdContainer();
}
return result;
--
Gitblit v1.9.1