From f44096c87b9e0690bb43e2d8145d4330f914b333 Mon Sep 17 00:00:00 2001
From: open-license-manager <rillf@maildrop.cc>
Date: 周三, 27 8月 2014 06:11:20 +0800
Subject: [PATCH] boost cmake 

---
 test/functional/volid_test.cpp |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/functional/volid_test.cpp b/test/functional/volid_test.cpp
index 996fbb6..aa0ba7d 100644
--- a/test/functional/volid_test.cpp
+++ b/test/functional/volid_test.cpp
@@ -1,6 +1,6 @@
 #define BOOST_TEST_MODULE standard_license_test
 //#define BOOST_TEST_MAIN
-#define BOOST_TEST_DYN_LINK
+//#undef BOOST_TEST_DYN_LINK
 #include <boost/test/unit_test.hpp>
 #include <fstream>
 #include <cstring>
@@ -23,7 +23,7 @@
 	IDENTIFICATION_STRATEGY strategy = IDENTIFICATION_STRATEGY::ETHERNET;
 	FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
 			strategy);
-	BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
+	BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
 	cout << "Identifier:" << identifier_out << endl;
 	vector<string> extraArgs = { "-s", identifier_out };
 	generate_license(licLocation, extraArgs);
@@ -46,7 +46,7 @@
 	for (int i = 0; i < num_strategies; i++) {
 		FUNCTION_RETURN generate_ok = generate_user_pc_signature(identifier_out,
 				strategies[i]);
-		BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
+		BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
 		idfile << identifier_out << endl;
 	}
 	idfile.close();
@@ -73,7 +73,7 @@
 	for (int i = 0; i < num_strategies; i++) {
 		FUNCTION_RETURN generate_ok = generate_user_pc_signature(
 				generated_identifier, strategies[i]);
-		BOOST_ASSERT(generate_ok == FUNCTION_RETURN::OK);
+		BOOST_ASSERT(generate_ok == FUNCTION_RETURN::FUNC_RET_OK);
 		if (reference_signatures[i] != generated_identifier) {
 			string message = string("pc signature compare fail: strategy:")
 					+ to_string(strategies[i]) + " generated: ["
@@ -87,7 +87,8 @@
 	for (int j = 0; j < 100; j++) {
 		for (unsigned int i = 0; i < reference_signatures.size(); i++) {
 			PcSignature pcsig;
-			strncpy(pcsig, reference_signatures[i].c_str(), sizeof(PcSignature));
+			strncpy(pcsig, reference_signatures[i].c_str(),
+					sizeof(PcSignature));
 			EVENT_TYPE val_result = validate_pc_signature(pcsig);
 			string message = string("pc signature verification strategy:")
 					+ to_string(i) + " generated: [" + generated_identifier
@@ -97,3 +98,4 @@
 		}
 	}
 }
+

--
Gitblit v1.9.1