From c7d36d7c48741bbaff1d661fb52e26e8a5b6f69e Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 17 Mar 2016 21:28:16 +0300 Subject: [PATCH] Split unit set project to intrusive and non-intrusive ones --- .gitignore | 1 + projects/Win/vc14/cds.sln | 3 ++ projects/Win/vc14/gtest-set.vcxproj | 24 ++++++++-------- projects/Win/vc14/gtest-set.vcxproj.filters | 24 ++++++++-------- test/unit/intrusive-set/CMakeLists.txt | 8 ------ test/unit/set/CMakeLists.txt | 28 +++++++++++++++++++ .../michael_michael_dhp.cpp | 0 .../michael_michael_hp.cpp | 0 .../michael_michael_nogc.cpp | 0 .../michael_michael_rcu_gpb.cpp | 0 .../michael_michael_rcu_gpi.cpp | 0 .../michael_michael_rcu_gpt.cpp | 0 .../michael_michael_rcu_shb.cpp | 0 .../michael_michael_rcu_sht.cpp | 0 .../test_michael_michael_rcu.h | 0 test/unit/{intrusive-set => set}/test_set.h | 0 .../unit/{intrusive-set => set}/test_set_hp.h | 0 .../{intrusive-set => set}/test_set_nogc.h | 0 .../{intrusive-set => set}/test_set_rcu.h | 0 19 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 test/unit/set/CMakeLists.txt rename test/unit/{intrusive-set => set}/michael_michael_dhp.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_hp.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_nogc.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_rcu_gpb.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_rcu_gpi.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_rcu_gpt.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_rcu_shb.cpp (100%) rename test/unit/{intrusive-set => set}/michael_michael_rcu_sht.cpp (100%) rename test/unit/{intrusive-set => set}/test_michael_michael_rcu.h (100%) rename test/unit/{intrusive-set => set}/test_set.h (100%) rename test/unit/{intrusive-set => set}/test_set_hp.h (100%) rename test/unit/{intrusive-set => set}/test_set_nogc.h (100%) rename test/unit/{intrusive-set => set}/test_set_rcu.h (100%) diff --git a/.gitignore b/.gitignore index 06a16f57..eb8ee396 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /.project /projects/Win/vc14/*.opendb /test/stress/data/dictionary.txt +/projects/Win/vc14/cds.VC.db diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index e201294d..4ccf4b30 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -211,6 +211,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-set", "gtest-set.vcxp EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-intrusive-set", "gtest-intrusive-set.vcxproj", "{EC1EF263-7E34-4867-9ED9-77AA7963CD4A}" + ProjectSection(ProjectDependencies) = postProject + {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/projects/Win/vc14/gtest-set.vcxproj b/projects/Win/vc14/gtest-set.vcxproj index c7bdd9a9..b4a380e8 100644 --- a/projects/Win/vc14/gtest-set.vcxproj +++ b/projects/Win/vc14/gtest-set.vcxproj @@ -28,10 +28,10 @@ - - - - + + + + 4503 4503 4503 @@ -39,8 +39,8 @@ 4503 4503 - - + + 4503 4503 4503 @@ -48,14 +48,14 @@ 4503 4503 - - + + - - - - + + + + {A589D3F1-A749-4268-ADEC-D0CE13D1E359} diff --git a/projects/Win/vc14/gtest-set.vcxproj.filters b/projects/Win/vc14/gtest-set.vcxproj.filters index 258217f1..df7f8752 100644 --- a/projects/Win/vc14/gtest-set.vcxproj.filters +++ b/projects/Win/vc14/gtest-set.vcxproj.filters @@ -21,42 +21,42 @@ Source Files - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Source Files\MichaelSet - + Header Files - + Header Files - + Header Files - + Header Files diff --git a/test/unit/intrusive-set/CMakeLists.txt b/test/unit/intrusive-set/CMakeLists.txt index c01513ef..a05cce67 100644 --- a/test/unit/intrusive-set/CMakeLists.txt +++ b/test/unit/intrusive-set/CMakeLists.txt @@ -51,14 +51,6 @@ set(CDSGTEST_SET_SOURCES intrusive_split_michael_rcu_gpt.cpp intrusive_split_michael_rcu_shb.cpp intrusive_split_michael_rcu_sht.cpp - michael_michael_hp.cpp - michael_michael_dhp.cpp - michael_michael_nogc.cpp - michael_michael_rcu_gpb.cpp - michael_michael_rcu_gpi.cpp - michael_michael_rcu_gpt.cpp - michael_michael_rcu_shb.cpp - michael_michael_rcu_sht.cpp ) include_directories( diff --git a/test/unit/set/CMakeLists.txt b/test/unit/set/CMakeLists.txt new file mode 100644 index 00000000..8691e718 --- /dev/null +++ b/test/unit/set/CMakeLists.txt @@ -0,0 +1,28 @@ +set(PACKAGE_NAME unit-set) + +set(CDSGTEST_SET_SOURCES + ../main.cpp + michael_michael_hp.cpp + michael_michael_dhp.cpp + michael_michael_nogc.cpp + michael_michael_rcu_gpb.cpp + michael_michael_rcu_gpi.cpp + michael_michael_rcu_gpt.cpp + michael_michael_rcu_shb.cpp + michael_michael_rcu_sht.cpp +) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_executable(${PACKAGE_NAME} ${CDSGTEST_SET_SOURCES}) +target_link_libraries(${PACKAGE_NAME} + ${CDS_SHARED_LIBRARY} + ${GTEST_LIBRARY} + ${Boost_THREAD_LIBRARY} + ${Boost_SYSTEM_LIBRARY} + ${CMAKE_THREAD_LIBS_INIT} +) + +add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) \ No newline at end of file diff --git a/test/unit/intrusive-set/michael_michael_dhp.cpp b/test/unit/set/michael_michael_dhp.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_dhp.cpp rename to test/unit/set/michael_michael_dhp.cpp diff --git a/test/unit/intrusive-set/michael_michael_hp.cpp b/test/unit/set/michael_michael_hp.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_hp.cpp rename to test/unit/set/michael_michael_hp.cpp diff --git a/test/unit/intrusive-set/michael_michael_nogc.cpp b/test/unit/set/michael_michael_nogc.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_nogc.cpp rename to test/unit/set/michael_michael_nogc.cpp diff --git a/test/unit/intrusive-set/michael_michael_rcu_gpb.cpp b/test/unit/set/michael_michael_rcu_gpb.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_rcu_gpb.cpp rename to test/unit/set/michael_michael_rcu_gpb.cpp diff --git a/test/unit/intrusive-set/michael_michael_rcu_gpi.cpp b/test/unit/set/michael_michael_rcu_gpi.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_rcu_gpi.cpp rename to test/unit/set/michael_michael_rcu_gpi.cpp diff --git a/test/unit/intrusive-set/michael_michael_rcu_gpt.cpp b/test/unit/set/michael_michael_rcu_gpt.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_rcu_gpt.cpp rename to test/unit/set/michael_michael_rcu_gpt.cpp diff --git a/test/unit/intrusive-set/michael_michael_rcu_shb.cpp b/test/unit/set/michael_michael_rcu_shb.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_rcu_shb.cpp rename to test/unit/set/michael_michael_rcu_shb.cpp diff --git a/test/unit/intrusive-set/michael_michael_rcu_sht.cpp b/test/unit/set/michael_michael_rcu_sht.cpp similarity index 100% rename from test/unit/intrusive-set/michael_michael_rcu_sht.cpp rename to test/unit/set/michael_michael_rcu_sht.cpp diff --git a/test/unit/intrusive-set/test_michael_michael_rcu.h b/test/unit/set/test_michael_michael_rcu.h similarity index 100% rename from test/unit/intrusive-set/test_michael_michael_rcu.h rename to test/unit/set/test_michael_michael_rcu.h diff --git a/test/unit/intrusive-set/test_set.h b/test/unit/set/test_set.h similarity index 100% rename from test/unit/intrusive-set/test_set.h rename to test/unit/set/test_set.h diff --git a/test/unit/intrusive-set/test_set_hp.h b/test/unit/set/test_set_hp.h similarity index 100% rename from test/unit/intrusive-set/test_set_hp.h rename to test/unit/set/test_set_hp.h diff --git a/test/unit/intrusive-set/test_set_nogc.h b/test/unit/set/test_set_nogc.h similarity index 100% rename from test/unit/intrusive-set/test_set_nogc.h rename to test/unit/set/test_set_nogc.h diff --git a/test/unit/intrusive-set/test_set_rcu.h b/test/unit/set/test_set_rcu.h similarity index 100% rename from test/unit/intrusive-set/test_set_rcu.h rename to test/unit/set/test_set_rcu.h -- 2.34.1