This commit is contained in:
Amaury Chamayou 2020-07-16 14:58:39 +01:00 коммит произвёл GitHub
Родитель 536d24650a
Коммит 52a3fed055
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 25 добавлений и 19 удалений

Просмотреть файл

@ -34,7 +34,7 @@ jobs:
parameters:
target: NoSGX
env: '${{ parameters.env.NoSGX }}'
cmake_args: '${{ parameters.build.debug.cmake_args }} ${{ parameters.build.NoSGX.cmake_args }}'
cmake_args: '-DPBFT_TESTS=ON ${{ parameters.build.debug.cmake_args }} ${{ parameters.build.NoSGX.cmake_args }}'
suffix: 'Instrumented'
artifact_name: 'NoSGX_Instrumented'
ctest_filter: '-LE "benchmark|perf|long_test"'
@ -44,7 +44,7 @@ jobs:
parameters:
target: SGX
env: '${{ parameters.env.SGX }}'
cmake_args: '${{ parameters.build.SGX.cmake_args }} -DTLS_TEST=ON -DSHUFFLE_SUITE=ON'
cmake_args: '-DPBFT_TESTS=ON ${{ parameters.build.SGX.cmake_args }} -DTLS_TEST=ON -DSHUFFLE_SUITE=ON'
suffix: 'Release'
artifact_name: 'SGX_Release'
ctest_filter: '-LE "benchmark|perf"'

Просмотреть файл

@ -42,7 +42,11 @@ configure_file(
${CCF_DIR}/src/host/version.h.in ${CCF_GENERATED_DIR}/version.h @ONLY
)
set(CONSENSUSES raft pbft)
if(PBFT_TESTS)
set(CONSENSUSES raft pbft)
else()
set(CONSENSUSES raft)
endif()
option(BUILD_TESTS "Build tests" ON)
option(BUILD_UNIT_TESTS "Build unit tests" ON)
@ -583,22 +587,6 @@ if(BUILD_TESTS)
)
endif()
add_e2e_test(
NAME suspend_nodes_pbft
PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/suspend_nodes.py
CONSENSUS pbft
LABEL long_test
ADDITIONAL_ARGS --seed 42
)
add_e2e_test(
NAME replay_new_view_pbft
PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/replay_new_view.py
CONSENSUS pbft
LABEL long_test
ADDITIONAL_ARGS --seed 42
)
if(BUILD_SMALLBANK)
include(${CMAKE_CURRENT_SOURCE_DIR}/samples/apps/smallbank/smallbank.cmake)
endif()
@ -713,6 +701,24 @@ if(BUILD_TESTS)
ADDITIONAL_ARGS ${ELECTION_TIMEOUT_ARG}
)
if(${CONSENSUS} STREQUAL pbft)
add_e2e_test(
NAME suspend_nodes_pbft
PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/suspend_nodes.py
CONSENSUS pbft
LABEL long_test
ADDITIONAL_ARGS --seed 42
)
add_e2e_test(
NAME replay_new_view_pbft
PYTHON_SCRIPT ${CMAKE_SOURCE_DIR}/tests/replay_new_view.py
CONSENSUS pbft
LABEL long_test
ADDITIONAL_ARGS --seed 42
)
endif()
endforeach()
add_perf_test(