Skip to content

Commit 2f65ba9

Browse files
authored
Merge pull request #40 from jcarpent/devel
Fix packaging issues and remove useless test files
2 parents a10730c + ac775c6 commit 2f65ba9

File tree

3 files changed

+1
-324
lines changed

3 files changed

+1
-324
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,6 @@ macro(proxsuite_test name path)
2727
PRIVATE PROBLEM_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
2828
endmacro()
2929

30-
if(0)
31-
add_custom_command(
32-
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qp_problem/source_files.txt
33-
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/save_qp_eq.py
34-
${CMAKE_CURRENT_BINARY_DIR}
35-
MAIN_DEPENDENCY src/save_qp_eq.py)
36-
add_custom_target(
37-
test.qp_eq.py.generated_problems
38-
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/qp_proble m/source_files.txt)
39-
40-
add_executable(test.qp_eq.py src/qp_eq_py.cpp)
41-
add_dependencies(test.qp_eq.py test.qp_eq.py.generated_problems)
42-
target_link_libraries(test.qp_eq.py ${LDLT_TEST_LIBS} doctest)
43-
44-
target_compile_definitions(
45-
test.qp_eq.py
46-
PUBLIC INRIA_LDLT_QP_PYTHON_PATH="${CMAKE_CURRENT_BINARY_DIR}/qp_problem/")
47-
endif()
48-
4930
proxsuite_test(dense_ruiz_equilibration src/dense_ruiz_equilibration.cpp)
5031
proxsuite_test(dense_qp_eq src/dense_qp_eq.cpp)
5132
proxsuite_test(dense_qp_with_eq_and_in src/dense_qp_with_eq_and_in.cpp)
@@ -63,10 +44,8 @@ proxsuite_test(cvxpy src/cvxpy.cpp)
6344

6445
if(BUILD_PYTHON_INTERFACE)
6546
file(GLOB_RECURSE ${PROJECT_NAME}_PYTHON_UNITTEST *.py)
66-
list(REMOVE_ITEM ${PROJECT_NAME}_PYTHON_UNITTEST
67-
${CMAKE_CURRENT_SOURCE_DIR}/src/save_qp_eq.py)
6847
foreach(TEST ${${PROJECT_NAME}_PYTHON_UNITTEST})
6948
string(REGEX REPLACE "${PROJECT_SOURCE_DIR}/test/src/" "" TEST ${TEST})
70-
add_python_unit_test("py-${TEST}" "test/src/${TEST}")
49+
add_python_unit_test("py-${TEST}" "test/src/${TEST}" "bindings/python")
7150
endforeach(TEST ${${PROJECT_NAME}_PYTHON_UNITTEST})
7251
endif(BUILD_PYTHON_INTERFACE)

test/src/qp_eq_py.cpp

Lines changed: 0 additions & 83 deletions
This file was deleted.

test/src/save_qp_eq.py

Lines changed: 0 additions & 219 deletions
This file was deleted.

0 commit comments

Comments
 (0)