Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

new build with separated testsuite #394

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

new build with separated testsuite #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aaa2049
new build with separated testsuite
rigazilla Jul 5, 2022
e770472
fix
rigazilla Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,013 changes: 132 additions & 881 deletions CMakeLists.txt
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 16 additions & 4 deletions build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ if [ "$INFINISPAN_VERSION" == "" ]
fi

BUILD_DIR=build
TEST_BUILD_DIR=testbuild

wget --progress=dot:giga -N http://downloads.jboss.org/infinispan/${INFINISPAN_VERSION}/infinispan-server-${INFINISPAN_VERSION}.zip

Expand Down Expand Up @@ -73,11 +74,22 @@ then
else
rm -rf ${BUILD_DIR} &&
mkdir ${BUILD_DIR} &&
cd ${BUILD_DIR} &&
echo CXXFLAGS="-Wno-error=maybe-uninitialized" cmake ${CMAKE_EXTRAS} .. &&
CXXFLAGS="-Wno-error=maybe-uninitialized" cmake ${CMAKE_EXTRAS} .. &&
pushd ${BUILD_DIR} &&
echo cmake ${CMAKE_EXTRAS} .. &&
cmake ${CMAKE_EXTRAS} .. &&
cmake --build . &&
popd &&
pushd test &
rm -rf ${TEST_BUILD_DIR} &&
mkdir ${TEST_BUILD_DIR} &&
cd ${TEST_BUILD_DIR} &&
cmake ${CMAKE_EXTRAS} .. &&
cmake ${CMAKE_EXTRAS} .. &&
cmake --build . &&
ctest -V &&
popd &&
pushd ${BUILD_DIR} &&
cpack -G RPM &&
cpack -C RelWithDebInfo --config CPackSourceConfig.cmake -G ZIP
cpack -C RelWithDebInfo --config CPackSourceConfig.cmake -G ZIP &&
popd
fi
563 changes: 563 additions & 0 deletions test/CMakeLists.txt
View file
Open in desktop

Large diffs are not rendered by default.

0 gtest-CMakeLists.txt.in → test/gtest-CMakeLists.txt.in
View file
Open in desktop
File renamed without changes.
0 src/hotrod/test/ConnectionPoolTest.cpp → test/internalTest/ConnectionPoolTest.cpp
View file
Open in desktop
File renamed without changes.
0 src/hotrod/test/HashTest.cpp → test/internalTest/HashTest.cpp
View file
Open in desktop
File renamed without changes.
0 src/hotrod/test/Unit.cpp → test/internalTest/Unit.cpp
View file
Open in desktop
File renamed without changes.
0 krbserver/pom.xml → test/krbserver/pom.xml
View file
Open in desktop
File renamed without changes.
0 ...erver/src/main/java/krbserver/Server.java → ...erver/src/main/java/krbserver/Server.java
View file
Open in desktop
File renamed without changes.
0 xunit-test/CMakeLists.txt → test/xunit-test/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/ClearTest/CMakeLists.txt → test/xunit-test/ClearTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ set_target_properties (ClearTest PROPERTIES COMPILE_FLAGS "${COMPILER_FLAGS} ${W
set_target_properties(ClearTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPORT_STATIC}" )
target_link_libraries(ClearTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_ClearTest ClearTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 xunit-test/ClearTest/ClearTest.cpp → test/xunit-test/ClearTest/ClearTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/ClearTest/ClearTest.h → test/xunit-test/ClearTest/ClearTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/ClearTest/main.cpp → test/xunit-test/ClearTest/main.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/CountersTest/CMakeLists.txt → test/xunit-test/CountersTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ set_target_properties(CountersTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPORT_S

target_link_libraries(CountersTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_CountersTest CountersTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 ...t-test/CountersTest/StrongCounterTest.cpp → ...t-test/CountersTest/StrongCounterTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/CountersTest/StrongCounterTest.h → ...nit-test/CountersTest/StrongCounterTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/CountersTest/WeakCounterTest.cpp → ...nit-test/CountersTest/WeakCounterTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/CountersTest/WeakCounterTest.h → ...xunit-test/CountersTest/WeakCounterTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/CountersTest/main.cpp → test/xunit-test/CountersTest/main.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/NearCacheTest/CMakeLists.txt → test/xunit-test/NearCacheTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ set_target_properties(xunit_nearCacheTest PROPERTIES COMPILE_DEFINITIONS "${DLLE

target_link_libraries(xunit_nearCacheTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_nearCacheTest xunit_nearCacheTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 ...t/NearCacheTest/NearCacheEvictionTest.cpp → ...t/NearCacheTest/NearCacheEvictionTest.cpp
View file
Open in desktop
File renamed without changes.
0 ...est/NearCacheTest/NearCacheEvictionTest.h → ...est/NearCacheTest/NearCacheEvictionTest.h
View file
Open in desktop
File renamed without changes.
0 ...earCacheTest/NearCacheMultiClientTest.cpp → ...earCacheTest/NearCacheMultiClientTest.cpp
View file
Open in desktop
File renamed without changes.
0 .../NearCacheTest/NearCacheMultiClientTest.h → .../NearCacheTest/NearCacheMultiClientTest.h
View file
Open in desktop
File renamed without changes.
0 ...NearCacheTest/NearCacheStaleReadsTest.cpp → ...NearCacheTest/NearCacheStaleReadsTest.cpp
View file
Open in desktop
File renamed without changes.
0 ...t/NearCacheTest/NearCacheStaleReadsTest.h → ...t/NearCacheTest/NearCacheStaleReadsTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/NearCacheTest/main.cpp → test/xunit-test/NearCacheTest/main.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/PutGetTest/CMakeLists.txt → test/xunit-test/PutGetTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ set_target_properties(PutGetTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPORT_STA

target_link_libraries(PutGetTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_PutGetTest PutGetTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 xunit-test/PutGetTest/PutGetTest.cpp → test/xunit-test/PutGetTest/PutGetTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/PutGetTest/PutGetTest.h → test/xunit-test/PutGetTest/PutGetTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/PutGetTest/main.cpp → test/xunit-test/PutGetTest/main.cpp
View file
Open in desktop
File renamed without changes.
12 changes: 6 additions & 6 deletions xunit-test/QueryTest/CMakeLists.txt → test/xunit-test/QueryTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
file(GLOB SRCS *.cpp)


file(COPY ${CMAKE_ROOT_SOURCE_DIR}/test/query_proto/bank-xunit.proto DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
file(COPY ${CMAKE_ROOT_SOURCE_DIR}/query_proto/bank-xunit.proto DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")

hr_protobuf_generate_cpp(TEST_PROTO_SRCS TEST_PROTO_HDRS .
${CMAKE_ROOT_SOURCE_DIR}/test/query_proto/bank-xunit.proto
${CMAKE_ROOT_SOURCE_DIR}/query_proto/bank-xunit.proto
)

add_executable(xunitQueryTest ${SRCS} ${TEST_PROTO_SRCS})
Expand All @@ -17,11 +17,11 @@ set_target_properties(xunitQueryTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPORT

target_link_libraries(xunitQueryTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} ${platform_libs} gtest_main)

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_QueryTest xunitQueryTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 xunit-test/QueryTest/QueryTest.cpp → test/xunit-test/QueryTest/QueryTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/QueryTest/QueryTest.h → test/xunit-test/QueryTest/QueryTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/QueryTest/main.cpp → test/xunit-test/QueryTest/main.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/TransactionTest/CMakeLists.txt → ...xunit-test/TransactionTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ set_target_properties(TransactionTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPOR

target_link_libraries(TransactionTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_TransactionTest TransactionTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 ...-test/TransactionTest/TransactionTest.cpp → ...-test/TransactionTest/TransactionTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/TransactionTest/TransactionTest.h → ...it-test/TransactionTest/TransactionTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/TransactionTest/main.cpp → test/xunit-test/TransactionTest/main.cpp
View file
Open in desktop
File renamed without changes.
8 changes: 4 additions & 4 deletions xunit-test/TranscoderTest/CMakeLists.txt → .../xunit-test/TranscoderTest/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ set_target_properties(TranscoderTest PROPERTIES COMPILE_DEFINITIONS "${DLLEXPORT

target_link_libraries(TranscoderTest hotrod hotrod_protobuf ${PROTOBUF_LIBRARY} ${OPENSSL_LIBRARIES} gtest_main ${platform_libs})

add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_JBOSS_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60)
add_test (start_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py start ${JAVA_RUNTIME} ${HOTROD_ISPN_HOME} infinispan.xml)
add_test (probe_port ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60)

add_test(xunit_TranscoderTest TranscoderTest --gtest_output=xml:${PROJECT_BINARY_DIR}/test-output/)

add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/test/bin/probe_port.py localhost 11222 60 down)
add_test (stop_server ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/server_ctl.py stop)
add_test (probe_port_stop ${PYTHON_EXECUTABLE} ${CMAKE_ROOT_SOURCE_DIR}/bin/probe_port.py localhost 11222 60 down)

0 xunit-test/TranscoderTest/TranscoderTest.cpp → ...it-test/TranscoderTest/TranscoderTest.cpp
View file
Open in desktop
File renamed without changes.
0 xunit-test/TranscoderTest/TranscoderTest.h → ...unit-test/TranscoderTest/TranscoderTest.h
View file
Open in desktop
File renamed without changes.
0 xunit-test/TranscoderTest/main.cpp → test/xunit-test/TranscoderTest/main.cpp
View file
Open in desktop
File renamed without changes.