From b0bddeb92d4b860d97ffea8655113673a9adfaba Mon Sep 17 00:00:00 2001 From: khizmax Date: Mon, 3 Oct 2016 09:04:29 +0300 Subject: [PATCH] Splitted unit-list test --- projects/Win/vc14/cds.sln | 18 ++ projects/Win/vc14/gtest-deque.vcxproj.filters | 4 - .../Win/vc14/gtest-intrusive-list.vcxproj | 270 ++++++++++++++++++ .../vc14/gtest-intrusive-list.vcxproj.filters | 107 +++++++ projects/Win/vc14/gtest-list.vcxproj | 54 ---- projects/Win/vc14/gtest-list.vcxproj.filters | 82 ------ .../vc14/gtest-striped-map.vcxproj.filters | 4 - projects/Win/vc14/gtest-tree.vcxproj.filters | 4 - .../Win/vc14/stress-framework.vcxproj.filters | 4 - test/unit/CMakeLists.txt | 2 + test/unit/intrusive-list/CMakeLists.txt | 36 +++ .../intrusive_iterable_dhp.cpp | 0 .../intrusive_iterable_hp.cpp | 0 .../intrusive_lazy_dhp.cpp | 0 .../intrusive_lazy_hp.cpp | 0 .../intrusive_lazy_nogc.cpp | 0 .../intrusive_lazy_rcu_gpb.cpp | 0 .../intrusive_lazy_rcu_gpi.cpp | 0 .../intrusive_lazy_rcu_gpt.cpp | 0 .../intrusive_lazy_rcu_shb.cpp | 0 .../intrusive_lazy_rcu_sht.cpp | 0 .../intrusive_michael_dhp.cpp | 0 .../intrusive_michael_hp.cpp | 0 .../intrusive_michael_nogc.cpp | 0 .../intrusive_michael_rcu_gpb.cpp | 0 .../intrusive_michael_rcu_gpi.cpp | 0 .../intrusive_michael_rcu_gpt.cpp | 0 .../intrusive_michael_rcu_shb.cpp | 0 .../intrusive_michael_rcu_sht.cpp | 0 .../test_intrusive_iterable_list.h | 0 .../test_intrusive_iterable_list_hp.h | 0 .../test_intrusive_lazy_rcu.h | 0 .../test_intrusive_list.h | 0 .../test_intrusive_list_hp.h | 0 .../test_intrusive_list_nogc.h | 0 .../test_intrusive_list_rcu.h | 0 .../test_intrusive_michael_rcu.h | 0 test/unit/list/CMakeLists.txt | 18 -- 38 files changed, 433 insertions(+), 170 deletions(-) create mode 100644 projects/Win/vc14/gtest-intrusive-list.vcxproj create mode 100644 projects/Win/vc14/gtest-intrusive-list.vcxproj.filters create mode 100644 test/unit/intrusive-list/CMakeLists.txt rename test/unit/{list => intrusive-list}/intrusive_iterable_dhp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_iterable_hp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_dhp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_hp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_nogc.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_rcu_gpb.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_rcu_gpi.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_rcu_gpt.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_rcu_shb.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_lazy_rcu_sht.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_dhp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_hp.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_nogc.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_rcu_gpb.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_rcu_gpi.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_rcu_gpt.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_rcu_shb.cpp (100%) rename test/unit/{list => intrusive-list}/intrusive_michael_rcu_sht.cpp (100%) rename test/unit/{list => intrusive-list}/test_intrusive_iterable_list.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_iterable_list_hp.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_lazy_rcu.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_list.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_list_hp.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_list_nogc.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_list_rcu.h (100%) rename test/unit/{list => intrusive-list}/test_intrusive_michael_rcu.h (100%) diff --git a/projects/Win/vc14/cds.sln b/projects/Win/vc14/cds.sln index decb0e12..4d76bb34 100644 --- a/projects/Win/vc14/cds.sln +++ b/projects/Win/vc14/cds.sln @@ -239,6 +239,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stress-freelist", "stress-f {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtest-intrusive-list", "gtest-intrusive-list.vcxproj", "{43563014-EE75-4855-87B5-A2F59762F413}" + ProjectSection(ProjectDependencies) = postProject + {408FE9BC-44F0-4E6A-89FA-D6F952584239} = {408FE9BC-44F0-4E6A-89FA-D6F952584239} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -633,6 +638,18 @@ Global {79A6845E-85BF-4000-94FF-9DF2473460D4}.Release|Win32.Build.0 = Release|Win32 {79A6845E-85BF-4000-94FF-9DF2473460D4}.Release|x64.ActiveCfg = Release|x64 {79A6845E-85BF-4000-94FF-9DF2473460D4}.Release|x64.Build.0 = Release|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.Debug|Win32.ActiveCfg = Debug|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.Debug|Win32.Build.0 = Debug|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.Debug|x64.ActiveCfg = Debug|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.Debug|x64.Build.0 = Debug|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.DebugVLD|Win32.ActiveCfg = DebugVLD|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.DebugVLD|Win32.Build.0 = DebugVLD|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.DebugVLD|x64.ActiveCfg = DebugVLD|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.DebugVLD|x64.Build.0 = DebugVLD|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.Release|Win32.ActiveCfg = Release|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.Release|Win32.Build.0 = Release|Win32 + {43563014-EE75-4855-87B5-A2F59762F413}.Release|x64.ActiveCfg = Release|x64 + {43563014-EE75-4855-87B5-A2F59762F413}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -673,6 +690,7 @@ Global {24DF3B87-387E-4EFC-BDE0-8DAD279FE19A} = {7D3EE35B-185D-40B5-88C2-7F9933426978} {31952FA8-A303-4A0B-94C4-ABA5A8A6DBCE} = {0D83E8C7-97D1-4BA1-928A-6846E7089652} {79A6845E-85BF-4000-94FF-9DF2473460D4} = {10E1FAF2-904D-405E-8AB5-6878A1B03346} + {43563014-EE75-4855-87B5-A2F59762F413} = {810490B7-31E5-49AE-8455-CAF99A9658B6} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} diff --git a/projects/Win/vc14/gtest-deque.vcxproj.filters b/projects/Win/vc14/gtest-deque.vcxproj.filters index f8df4a76..ae4487bd 100644 --- a/projects/Win/vc14/gtest-deque.vcxproj.filters +++ b/projects/Win/vc14/gtest-deque.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - diff --git a/projects/Win/vc14/gtest-intrusive-list.vcxproj b/projects/Win/vc14/gtest-intrusive-list.vcxproj new file mode 100644 index 00000000..8e6171ae --- /dev/null +++ b/projects/Win/vc14/gtest-intrusive-list.vcxproj @@ -0,0 +1,270 @@ + + + + + DebugVLD + Win32 + + + DebugVLD + x64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {43563014-EE75-4855-87B5-A2F59762F413} + Win32Proj + intrusive_list + 8.1 + + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + Application + true + v140 + Unicode + + + Application + true + v140 + Unicode + + + Application + false + v140 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + true + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + $(ProjectName)_d + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + false + $(SolutionDir)..\..\..\bin\vc.$(PlatformToolset)\$(Platform)-release\ + $(SolutionDir)..\..\..\obj\vc.$(PlatformToolset)\$(Platform)\$(ProjectName)\$(Configuration)\ + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + NotUsing + Level3 + Disabled + _ENABLE_ATOMIC_ALIGNMENT_FIX;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtestd.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + true + true + $(GTEST_LIB32);$(GTEST_ROOT)/lib/x86;$(BOOST_PATH)/stage32/lib;$(BOOST_PATH)/stage/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + Level3 + NotUsing + MaxSpeed + true + true + _ENABLE_ATOMIC_ALIGNMENT_FIX;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(SolutionDir)..\..\..;$(GTEST_ROOT)/include;$(SolutionDir)..\..\..\test\include;$(BOOST_PATH);%(AdditionalIncludeDirectories) + 4503 + + + Console + true + true + true + $(GTEST_LIB64);$(GTEST_ROOT)/lib/x64;$(BOOST_PATH)/stage64/lib;$(BOOST_PATH)/bin;%(AdditionalLibraryDirectories);$(OutDir) + gtest.lib;%(AdditionalDependencies) + + + + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-intrusive-list.vcxproj.filters b/projects/Win/vc14/gtest-intrusive-list.vcxproj.filters new file mode 100644 index 00000000..6ec8874e --- /dev/null +++ b/projects/Win/vc14/gtest-intrusive-list.vcxproj.filters @@ -0,0 +1,107 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {f6bc2494-0971-483b-98b2-7675d2aee7c9} + + + {b975977c-e055-46d0-95ea-bc94c66c6d50} + + + {edd852ff-4431-4c46-9592-dbbba4d9846e} + + + + + Source Files + + + Source Files\iterable_list + + + Source Files\iterable_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\lazy_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + Source Files\michael_list + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/projects/Win/vc14/gtest-list.vcxproj b/projects/Win/vc14/gtest-list.vcxproj index 24ab1e1f..0d8f91d9 100644 --- a/projects/Win/vc14/gtest-list.vcxproj +++ b/projects/Win/vc14/gtest-list.vcxproj @@ -27,14 +27,6 @@ - - - - - - - - @@ -53,52 +45,6 @@ - - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - 4503 - 4503 - 4503 - 4503 - 4503 - 4503 - - - - diff --git a/projects/Win/vc14/gtest-list.vcxproj.filters b/projects/Win/vc14/gtest-list.vcxproj.filters index eec2b0e6..ba6182e3 100644 --- a/projects/Win/vc14/gtest-list.vcxproj.filters +++ b/projects/Win/vc14/gtest-list.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {f6bc2494-0971-483b-98b2-7675d2aee7c9} @@ -24,24 +20,6 @@ - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - Header Files @@ -78,12 +56,6 @@ Header Files - - Header Files - - - Header Files - Header Files @@ -101,60 +73,6 @@ Source Files - - Source Files\iterable_list - - - Source Files\iterable_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\lazy_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - - - Source Files\michael_list - Source Files\lazy_list diff --git a/projects/Win/vc14/gtest-striped-map.vcxproj.filters b/projects/Win/vc14/gtest-striped-map.vcxproj.filters index 97797d16..cd872963 100644 --- a/projects/Win/vc14/gtest-striped-map.vcxproj.filters +++ b/projects/Win/vc14/gtest-striped-map.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - diff --git a/projects/Win/vc14/gtest-tree.vcxproj.filters b/projects/Win/vc14/gtest-tree.vcxproj.filters index fabcd1c4..b909eb12 100644 --- a/projects/Win/vc14/gtest-tree.vcxproj.filters +++ b/projects/Win/vc14/gtest-tree.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - {5e28703f-0f92-4c6c-b3a6-3bd837deb8f6} diff --git a/projects/Win/vc14/stress-framework.vcxproj.filters b/projects/Win/vc14/stress-framework.vcxproj.filters index 9599b06f..00de287f 100644 --- a/projects/Win/vc14/stress-framework.vcxproj.filters +++ b/projects/Win/vc14/stress-framework.vcxproj.filters @@ -9,10 +9,6 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hh;hpp;hxx;hm;inl;inc;xsd - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 46432de6..884e429b 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -1,4 +1,5 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/deque) +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/intrusive-list) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/list) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/map) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/misc) @@ -14,6 +15,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tree) add_custom_target(unit-all DEPENDS unit-deque + unit-intrusive-list unit-list unit-map unit-misc diff --git a/test/unit/intrusive-list/CMakeLists.txt b/test/unit/intrusive-list/CMakeLists.txt new file mode 100644 index 00000000..8b11444f --- /dev/null +++ b/test/unit/intrusive-list/CMakeLists.txt @@ -0,0 +1,36 @@ +set(PACKAGE_NAME unit-intrusive-list) + +set(CDSGTEST_INTRUSIVE_LIST_SOURCES + ../main.cpp + intrusive_lazy_hp.cpp + intrusive_lazy_dhp.cpp + intrusive_lazy_nogc.cpp + intrusive_lazy_rcu_gpb.cpp + intrusive_lazy_rcu_gpi.cpp + intrusive_lazy_rcu_gpt.cpp + intrusive_lazy_rcu_shb.cpp + intrusive_lazy_rcu_sht.cpp + intrusive_michael_hp.cpp + intrusive_michael_dhp.cpp + intrusive_michael_nogc.cpp + intrusive_michael_rcu_gpb.cpp + intrusive_michael_rcu_gpi.cpp + intrusive_michael_rcu_gpt.cpp + intrusive_michael_rcu_shb.cpp + intrusive_michael_rcu_sht.cpp +) + +include_directories( + ${CMAKE_CURRENT_SOURCE_DIR} +) + +add_executable(${PACKAGE_NAME} ${CDSGTEST_INTRUSIVE_LIST_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/list/intrusive_iterable_dhp.cpp b/test/unit/intrusive-list/intrusive_iterable_dhp.cpp similarity index 100% rename from test/unit/list/intrusive_iterable_dhp.cpp rename to test/unit/intrusive-list/intrusive_iterable_dhp.cpp diff --git a/test/unit/list/intrusive_iterable_hp.cpp b/test/unit/intrusive-list/intrusive_iterable_hp.cpp similarity index 100% rename from test/unit/list/intrusive_iterable_hp.cpp rename to test/unit/intrusive-list/intrusive_iterable_hp.cpp diff --git a/test/unit/list/intrusive_lazy_dhp.cpp b/test/unit/intrusive-list/intrusive_lazy_dhp.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_dhp.cpp rename to test/unit/intrusive-list/intrusive_lazy_dhp.cpp diff --git a/test/unit/list/intrusive_lazy_hp.cpp b/test/unit/intrusive-list/intrusive_lazy_hp.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_hp.cpp rename to test/unit/intrusive-list/intrusive_lazy_hp.cpp diff --git a/test/unit/list/intrusive_lazy_nogc.cpp b/test/unit/intrusive-list/intrusive_lazy_nogc.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_nogc.cpp rename to test/unit/intrusive-list/intrusive_lazy_nogc.cpp diff --git a/test/unit/list/intrusive_lazy_rcu_gpb.cpp b/test/unit/intrusive-list/intrusive_lazy_rcu_gpb.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_rcu_gpb.cpp rename to test/unit/intrusive-list/intrusive_lazy_rcu_gpb.cpp diff --git a/test/unit/list/intrusive_lazy_rcu_gpi.cpp b/test/unit/intrusive-list/intrusive_lazy_rcu_gpi.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_rcu_gpi.cpp rename to test/unit/intrusive-list/intrusive_lazy_rcu_gpi.cpp diff --git a/test/unit/list/intrusive_lazy_rcu_gpt.cpp b/test/unit/intrusive-list/intrusive_lazy_rcu_gpt.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_rcu_gpt.cpp rename to test/unit/intrusive-list/intrusive_lazy_rcu_gpt.cpp diff --git a/test/unit/list/intrusive_lazy_rcu_shb.cpp b/test/unit/intrusive-list/intrusive_lazy_rcu_shb.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_rcu_shb.cpp rename to test/unit/intrusive-list/intrusive_lazy_rcu_shb.cpp diff --git a/test/unit/list/intrusive_lazy_rcu_sht.cpp b/test/unit/intrusive-list/intrusive_lazy_rcu_sht.cpp similarity index 100% rename from test/unit/list/intrusive_lazy_rcu_sht.cpp rename to test/unit/intrusive-list/intrusive_lazy_rcu_sht.cpp diff --git a/test/unit/list/intrusive_michael_dhp.cpp b/test/unit/intrusive-list/intrusive_michael_dhp.cpp similarity index 100% rename from test/unit/list/intrusive_michael_dhp.cpp rename to test/unit/intrusive-list/intrusive_michael_dhp.cpp diff --git a/test/unit/list/intrusive_michael_hp.cpp b/test/unit/intrusive-list/intrusive_michael_hp.cpp similarity index 100% rename from test/unit/list/intrusive_michael_hp.cpp rename to test/unit/intrusive-list/intrusive_michael_hp.cpp diff --git a/test/unit/list/intrusive_michael_nogc.cpp b/test/unit/intrusive-list/intrusive_michael_nogc.cpp similarity index 100% rename from test/unit/list/intrusive_michael_nogc.cpp rename to test/unit/intrusive-list/intrusive_michael_nogc.cpp diff --git a/test/unit/list/intrusive_michael_rcu_gpb.cpp b/test/unit/intrusive-list/intrusive_michael_rcu_gpb.cpp similarity index 100% rename from test/unit/list/intrusive_michael_rcu_gpb.cpp rename to test/unit/intrusive-list/intrusive_michael_rcu_gpb.cpp diff --git a/test/unit/list/intrusive_michael_rcu_gpi.cpp b/test/unit/intrusive-list/intrusive_michael_rcu_gpi.cpp similarity index 100% rename from test/unit/list/intrusive_michael_rcu_gpi.cpp rename to test/unit/intrusive-list/intrusive_michael_rcu_gpi.cpp diff --git a/test/unit/list/intrusive_michael_rcu_gpt.cpp b/test/unit/intrusive-list/intrusive_michael_rcu_gpt.cpp similarity index 100% rename from test/unit/list/intrusive_michael_rcu_gpt.cpp rename to test/unit/intrusive-list/intrusive_michael_rcu_gpt.cpp diff --git a/test/unit/list/intrusive_michael_rcu_shb.cpp b/test/unit/intrusive-list/intrusive_michael_rcu_shb.cpp similarity index 100% rename from test/unit/list/intrusive_michael_rcu_shb.cpp rename to test/unit/intrusive-list/intrusive_michael_rcu_shb.cpp diff --git a/test/unit/list/intrusive_michael_rcu_sht.cpp b/test/unit/intrusive-list/intrusive_michael_rcu_sht.cpp similarity index 100% rename from test/unit/list/intrusive_michael_rcu_sht.cpp rename to test/unit/intrusive-list/intrusive_michael_rcu_sht.cpp diff --git a/test/unit/list/test_intrusive_iterable_list.h b/test/unit/intrusive-list/test_intrusive_iterable_list.h similarity index 100% rename from test/unit/list/test_intrusive_iterable_list.h rename to test/unit/intrusive-list/test_intrusive_iterable_list.h diff --git a/test/unit/list/test_intrusive_iterable_list_hp.h b/test/unit/intrusive-list/test_intrusive_iterable_list_hp.h similarity index 100% rename from test/unit/list/test_intrusive_iterable_list_hp.h rename to test/unit/intrusive-list/test_intrusive_iterable_list_hp.h diff --git a/test/unit/list/test_intrusive_lazy_rcu.h b/test/unit/intrusive-list/test_intrusive_lazy_rcu.h similarity index 100% rename from test/unit/list/test_intrusive_lazy_rcu.h rename to test/unit/intrusive-list/test_intrusive_lazy_rcu.h diff --git a/test/unit/list/test_intrusive_list.h b/test/unit/intrusive-list/test_intrusive_list.h similarity index 100% rename from test/unit/list/test_intrusive_list.h rename to test/unit/intrusive-list/test_intrusive_list.h diff --git a/test/unit/list/test_intrusive_list_hp.h b/test/unit/intrusive-list/test_intrusive_list_hp.h similarity index 100% rename from test/unit/list/test_intrusive_list_hp.h rename to test/unit/intrusive-list/test_intrusive_list_hp.h diff --git a/test/unit/list/test_intrusive_list_nogc.h b/test/unit/intrusive-list/test_intrusive_list_nogc.h similarity index 100% rename from test/unit/list/test_intrusive_list_nogc.h rename to test/unit/intrusive-list/test_intrusive_list_nogc.h diff --git a/test/unit/list/test_intrusive_list_rcu.h b/test/unit/intrusive-list/test_intrusive_list_rcu.h similarity index 100% rename from test/unit/list/test_intrusive_list_rcu.h rename to test/unit/intrusive-list/test_intrusive_list_rcu.h diff --git a/test/unit/list/test_intrusive_michael_rcu.h b/test/unit/intrusive-list/test_intrusive_michael_rcu.h similarity index 100% rename from test/unit/list/test_intrusive_michael_rcu.h rename to test/unit/intrusive-list/test_intrusive_michael_rcu.h diff --git a/test/unit/list/CMakeLists.txt b/test/unit/list/CMakeLists.txt index 36d8dc53..e94c5a62 100644 --- a/test/unit/list/CMakeLists.txt +++ b/test/unit/list/CMakeLists.txt @@ -2,24 +2,6 @@ set(PACKAGE_NAME unit-list) set(CDSGTEST_LIST_SOURCES ../main.cpp - intrusive_iterable_dhp.cpp - intrusive_iterable_hp.cpp - intrusive_lazy_hp.cpp - intrusive_lazy_dhp.cpp - intrusive_lazy_nogc.cpp - intrusive_lazy_rcu_gpb.cpp - intrusive_lazy_rcu_gpi.cpp - intrusive_lazy_rcu_gpt.cpp - intrusive_lazy_rcu_shb.cpp - intrusive_lazy_rcu_sht.cpp - intrusive_michael_hp.cpp - intrusive_michael_dhp.cpp - intrusive_michael_nogc.cpp - intrusive_michael_rcu_gpb.cpp - intrusive_michael_rcu_gpi.cpp - intrusive_michael_rcu_gpt.cpp - intrusive_michael_rcu_shb.cpp - intrusive_michael_rcu_sht.cpp iterable_hp.cpp iterable_dhp.cpp kv_iterable_hp.cpp -- 2.34.1