From e46af93bcc91a1f5660c22ade7c9dedead5a772a Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 30 11月 2019 23:24:58 +0800
Subject: [PATCH] fix centos
---
test/library/Os_Linux_test.cpp | 58 ++++++++++++++++++++++++++--------------------------------
1 files changed, 26 insertions(+), 32 deletions(-)
diff --git a/test/library/Os_Linux_test.cpp b/test/library/Os_Linux_test.cpp
index d916375..6d68d0d 100644
--- a/test/library/Os_Linux_test.cpp
+++ b/test/library/Os_Linux_test.cpp
@@ -1,75 +1,70 @@
#define BOOST_TEST_MODULE os_linux_test
-//#define BOOST_TEST_MAIN
-//#define BOOST_TEST_DYN_LINK
-#include <boost/test/unit_test.hpp>
-#include "../../src/library/os/os.h"
-#include <build_properties.h>
-
#include <string>
#include <iostream>
+#include <boost/test/unit_test.hpp>
+
+#include <licensecc_properties.h>
+#include <licensecc_properties_test.h>
+
+#include "../../src/library/os/os.h"
using namespace std;
-BOOST_AUTO_TEST_CASE( read_disk_id ) {
+BOOST_AUTO_TEST_CASE(read_disk_id) {
VIRTUALIZATION virt = getVirtualization();
- if(virt == NONE || virt == VM) {
- DiskInfo * diskInfos = NULL;
+ if (virt == NONE || virt == VM) {
+ DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
BOOST_CHECK_GT(disk_info_size, 0);
- diskInfos = (DiskInfo*) malloc(sizeof(DiskInfo) * disk_info_size);
+ diskInfos = (DiskInfo *)malloc(sizeof(DiskInfo) * disk_info_size);
result = getDiskInfos(diskInfos, &disk_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
BOOST_CHECK_GT(strlen(diskInfos[0].device), 0);
BOOST_CHECK_GT(strlen(diskInfos[0].label), 0);
BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0);
free(diskInfos);
- } else if(virt == CONTAINER){
- //docker or lxc diskInfo is not meaningful
- DiskInfo * diskInfos = NULL;
+ } else if (virt == CONTAINER) {
+ // docker or lxc diskInfo is not meaningful
+ DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
FUNCTION_RETURN result = getDiskInfos(NULL, &disk_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_NOT_AVAIL);
}
}
-BOOST_AUTO_TEST_CASE( read_network_adapters ) {
- OsAdapterInfo * adapter_info = NULL;
+BOOST_AUTO_TEST_CASE(read_network_adapters) {
+ OsAdapterInfo *adapter_info = NULL;
size_t adapter_info_size = 0;
FUNCTION_RETURN result = getAdapterInfos(NULL, &adapter_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
BOOST_CHECK_GT(adapter_info_size, 0);
- adapter_info = (OsAdapterInfo*) malloc(
- sizeof(OsAdapterInfo) * adapter_info_size);
+ adapter_info = (OsAdapterInfo *)malloc(sizeof(OsAdapterInfo) * adapter_info_size);
result = getAdapterInfos(adapter_info, &adapter_info_size);
BOOST_CHECK_EQUAL(result, FUNC_RET_OK);
for (size_t i = 0; i < adapter_info_size; i++) {
- cout << "Interface found: " << string(adapter_info[i].description)
- << endl;
+ cout << "Interface found: " << string(adapter_info[i].description) << endl;
BOOST_CHECK_GT(strlen(adapter_info[i].description), 0);
- //lo mac address is always 0 but it has ip
- //other interfaces may not be connected
+ // lo mac address is always 0 but it has ip
+ // other interfaces may not be connected
if (string(adapter_info[i].description) == "lo") {
BOOST_CHECK_NE(adapter_info[i].ipv4_address[0], 0);
} else {
bool mac_is_0 = true;
- for(int j=0;j<6;j++){
- mac_is_0 = mac_is_0 && (adapter_info[i].mac_address[j]==0);
+ for (int j = 0; j < 6; j++) {
+ mac_is_0 = mac_is_0 && (adapter_info[i].mac_address[j] == 0);
}
- BOOST_CHECK_MESSAGE( !mac_is_0,
- "Mac address for interface " << adapter_info[i].description << " is 0");
+ BOOST_CHECK_MESSAGE(!mac_is_0, "Mac address for interface " << adapter_info[i].description << " is 0");
}
}
free(adapter_info);
}
-BOOST_AUTO_TEST_CASE( get_cpuid ) {
- BOOST_CHECK_EQUAL(1, 1);
-}
+BOOST_AUTO_TEST_CASE(get_cpuid) { BOOST_CHECK_EQUAL(1, 1); }
-//To test if virtualization is detected correctly define an env variable VIRT_ENV
-//otherwise the test is skipped
-BOOST_AUTO_TEST_CASE( test_virtualization ) {
+// To test if virtualization is detected correctly define an env variable VIRT_ENV
+// otherwise the test is skipped
+BOOST_AUTO_TEST_CASE(test_virtualization) {
const char *env = getenv("VIRT_ENV");
if (env != NULL) {
if (strcmp(env, "CONTAINER") == 0) {
@@ -85,4 +80,3 @@
}
}
}
-
--
Gitblit v1.9.1