From a4b1a66a4436c97efbf0dd5932e403d97f0a13d3 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 24 10月 2020 19:55:33 +0800
Subject: [PATCH] fix windows issue
---
test/library/os_linux_test.cpp | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/test/library/os_linux_test.cpp b/test/library/os_linux_test.cpp
index 527da44..b44beb4 100644
--- a/test/library/os_linux_test.cpp
+++ b/test/library/os_linux_test.cpp
@@ -5,7 +5,7 @@
#include <licensecc_properties.h>
#include <licensecc_properties_test.h>
-#include "../../src/library/base/StringUtils.h"
+#include "../../src/library/base/string_utils.h"
#include "../../src/library/os/os.h"
#include "../../src/library/os/execution_environment.hpp"
@@ -16,21 +16,25 @@
BOOST_AUTO_TEST_CASE(read_disk_id) {
os::ExecutionEnvironment exec_env;
- os::VIRTUALIZATION virt = exec_env.getVirtualization();
- if (virt == VIRTUALIZATION::NONE || virt == VIRTUALIZATION::VM) {
+ LCC_API_VIRTUALIZATION_SUMMARY virt = exec_env.virtualization();
+ if (virt == LCC_API_VIRTUALIZATION_SUMMARY::NONE || virt == LCC_API_VIRTUALIZATION_SUMMARY::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(mstrnlen_s(diskInfos[0].device, sizeof(diskInfos[0].device)), 0);
BOOST_CHECK_GT(mstrnlen_s(diskInfos[0].label, sizeof diskInfos[0].label), 0);
- BOOST_CHECK_GT(diskInfos[0].disk_sn[0], 0);
+ bool all_zero = true;
+ for (int i = 0; i < sizeof(diskInfos[0].disk_sn) && all_zero; i++) {
+ all_zero = (diskInfos[0].disk_sn[i] == 0);
+ }
+ BOOST_CHECK_MESSAGE(!all_zero, "disksn is not all zero");
free(diskInfos);
- } else if (virt == VIRTUALIZATION::CONTAINER) {
+ } else if (virt == LCC_API_VIRTUALIZATION_SUMMARY::CONTAINER) {
// docker or lxc diskInfo is not meaningful
DiskInfo *diskInfos = NULL;
size_t disk_info_size = 0;
@@ -39,5 +43,5 @@
}
}
-} // namespace test
-} // namespace license
+} // namespace test
+} // namespace license
--
Gitblit v1.9.1