Skip to content

Commit 17ebb84

Browse files
authored
Removed legacy test support from cmake
Removed legacy tests support from cmake (and documentation)
1 parent c9dea44 commit 17ebb84

File tree

3 files changed

+0
-44
lines changed

3 files changed

+0
-44
lines changed

CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ if (PACKAGE_BUILD)
8787
option(FETCH_GMP "Fetch and compile the GMP library (DEFAULT: ON)" ON)
8888
else (PACKAGE_BUILD)
8989
# Properties to be enabled when not using PACKAGE_BUILD
90-
option(ENABLE_LEGACY_TEST
91-
"Build the legacy test files (does not work with PACKAGE_BUILD)"
92-
OFF)
9390
endif (PACKAGE_BUILD)
9491

9592
# Allow GMP_DIR and search in it if not using PACKAGE_BUILD or using
@@ -296,7 +293,6 @@ if (PACKAGE_BUILD)
296293
-DFETCH_GMP=${FETCH_GMP}
297294
-DENABLE_TEST=${ENABLE_TEST}
298295
-DHELIB_DEBUG=${HELIB_DEBUG}
299-
-DENABLE_LEGACY_TEST=OFF
300296
BUILD_ALWAYS ON)
301297

302298
if (ENABLE_TEST)

INSTALL.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ set to `OFF`, there should either exist a system-installed GMP library, or
232232
- `GMP_DIR`: Prefix of the GMP library. Ignored if `FETCH_GMP=ON`.
233233

234234
### Parameters specific to option 2 (library build)
235-
- `ENABLE_LEGACY_TEST=ON/OFF` (default is `OFF`): Build old test system
236-
(deprecated).
237235
- `GMP_DIR`: Prefix of the GMP library.
238236
- `NTL_DIR`: Prefix of the NTL library.
239237

src/CMakeLists.txt

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -186,33 +186,6 @@ set(HELIB_HEADERS
186186
"${CMAKE_CURRENT_BINARY_DIR}/helib/version.h" # version.h is auto-generated in CMAKE_CURRENT_BINARY_DIR
187187
)
188188

189-
set(LEGACY_TEST_SRCS
190-
"Test_approxNums.cpp"
191-
"Test_binaryArith.cpp"
192-
"Test_binaryCompare.cpp"
193-
"Test_Bin_IO.cpp"
194-
"Test_bootstrapping.cpp"
195-
"Test_EaCx.cpp"
196-
"Test_EvalMap.cpp"
197-
"Test_extractDigits.cpp"
198-
"Test_General.cpp"
199-
"Test_intraSlot.cpp"
200-
"Test_IO.cpp"
201-
"Test_matmul.cpp"
202-
"Test_PAlgebra.cpp"
203-
"Test_Permutations.cpp"
204-
"Test_PolyEval.cpp"
205-
"Test_Powerful.cpp"
206-
"Test_PtrVector.cpp"
207-
"Test_Replicate.cpp"
208-
"Test_tableLookup.cpp"
209-
"Test_ThinBootstrapping.cpp"
210-
"Test_ThinEvalMap.cpp"
211-
"Test_Timing.cpp"
212-
"Test_thinboot.cpp"
213-
"Test_fatboot.cpp"
214-
"Test_PGFFT.cpp")
215-
216189
# Add helib target as a shared/static library
217190
if (BUILD_SHARED)
218191
add_library(helib SHARED ${HELIB_SRCS} ${HELIB_HEADERS})
@@ -327,17 +300,6 @@ if (BUILD_SHARED)
327300
BUILD_WITH_INSTALL_RPATH OFF)
328301
endif (BUILD_SHARED)
329302

330-
if (ENABLE_LEGACY_TEST)
331-
foreach (TEST_FILE ${LEGACY_TEST_SRCS})
332-
string(REPLACE "\.cpp" "" TEST_NAME "${TEST_FILE}")
333-
add_executable(${TEST_NAME} ${TEST_FILE})
334-
# NOTE: Legacy tests depend only on HElib.
335-
# HElib's PUBLIC attributes will be added automatically when setting HElib
336-
# as a dependency.
337-
target_link_libraries(${TEST_NAME} helib)
338-
endforeach (TEST_FILE)
339-
endif (ENABLE_LEGACY_TEST)
340-
341303
if (ENABLE_TEST)
342304
add_subdirectory("${PROJECT_TESTS_DIR}" tests)
343305
endif (ENABLE_TEST)

0 commit comments

Comments
 (0)