From 11a0f65bae425baf09508e2d57c830f5cad69df5 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 14 12月 2019 09:42:26 +0800
Subject: [PATCH] cleanup and change license generation parameters

---
 test/functional/CMakeLists.txt |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/test/functional/CMakeLists.txt b/test/functional/CMakeLists.txt
index 1214157..cdcc680 100644
--- a/test/functional/CMakeLists.txt
+++ b/test/functional/CMakeLists.txt
@@ -4,55 +4,62 @@
 
 target_link_libraries(
 	license_generator_snippet
- 	license_generator_lib
+ 	${Boost_LIBRARIES}
 )
 
 add_executable(
- standard_license_test
+ test_standard_license
  standard-license_test.cpp
 )
 
 target_link_libraries(
- standard_license_test
+ test_standard_license
  licensecc_static
  license_generator_snippet
  ${Boost_LIBRARIES}
 )
 
 add_executable(
- date_test
+ test_date
  date_test.cpp
 )
 
 target_link_libraries(
- date_test
+ test_date
  licensecc_static
  license_generator_snippet
  ${Boost_LIBRARIES}
 )
 
 add_executable(
- volid_test
- volid_test.cpp
+ test_signature_verifier
+ signature_verifier_test.cpp
 )
 
 target_link_libraries(
- volid_test
+ test_signature_verifier
  licensecc_static
  license_generator_snippet
  ${Boost_LIBRARIES}
 )
 
 
-IF( ( CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux") AND CMAKE_CROSSCOMPILING)
-#binfmt_misc doesn't work in my system :(
-	ADD_TEST(NAME standard_license_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/standard_license_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-	ADD_TEST(NAME date_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/date_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-	ADD_TEST(NAME volid_test COMMAND wine ${CMAKE_CURRENT_BINARY_DIR}/volid_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-ELSE()
-	ADD_TEST(NAME standard_license_test COMMAND standard_license_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-	ADD_TEST(NAME date_test COMMAND date_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-	ADD_TEST(NAME volid_test COMMAND volid_test WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
-ENDIF()
+add_executable(
+ test_volid
+ volid_test.cpp
+)
+
+target_link_libraries(
+ test_volid
+ licensecc_static
+ license_generator_snippet
+ ${Boost_LIBRARIES}
+)
+
+
+ADD_TEST(NAME test_date COMMAND test_date WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_standard_license COMMAND test_standard_license WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_signature_verifier COMMAND test_signature_verifier WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+ADD_TEST(NAME test_volid COMMAND test_volid WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
 
 

--
Gitblit v1.9.1