Skip to content

Commit 2e42d0f

Browse files
committed
Update tests for new Python binding approach
1 parent f7457cc commit 2e42d0f

File tree

2 files changed

+18
-10
lines changed

2 files changed

+18
-10
lines changed

examples/CMakeLists.txt

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,20 @@ endforeach ()
3535
# Python Binding Examples
3636
find_package(Python3 REQUIRED COMPONENTS Interpreter)
3737

38+
add_test(NAME binding_install_py COMMAND ${Python3_EXECUTABLE} -m pip install --user ${PROJECT_SOURCE_DIR})
39+
set_tests_properties(binding_install_py PROPERTIES
40+
FIXTURES_SETUP python_setup) # Phony test to install the Python bindings
41+
3842
add_test(NAME test_binding_basic_py COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/bindings/basic.py)
39-
set_tests_properties(test_binding_basic_py PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
4043
set_tests_properties(test_binding_basic_py PROPERTIES LABELS "examples")
44+
set_tests_properties(test_binding_basic_py PROPERTIES FIXTURES_REQUIRED python_setup)
4145

4246
add_test(NAME test_binding_align_benchmark_py COMMAND
4347
${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/bindings/align_benchmark.py ${PROJECT_SOURCE_DIR}/tests/test_data/ONT.MiniION.1.seq)
44-
set_tests_properties(test_binding_align_benchmark_py PROPERTIES ENVIRONMENT "PYTHONPATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
4548
set_tests_properties(test_binding_align_benchmark_py PROPERTIES LABELS "examples")
46-
set_property(TEST test_binding_align_benchmark_py PROPERTY PASS_REGULAR_EXPRESSION "Score: 39743")
49+
set_tests_properties(test_binding_align_benchmark_py PROPERTIES PASS_REGULAR_EXPRESSION "Score: 39743")
50+
set_tests_properties(test_binding_align_benchmark_py PROPERTIES FIXTURES_REQUIRED python_setup)
51+
52+
add_test(NAME binding_cleanup_py COMMAND ${Python3_EXECUTABLE} -m pip uninstall -y quicked)
53+
set_tests_properties(binding_cleanup_py PROPERTIES
54+
FIXTURES_CLEANUP python_setup) # Phony test to uninstall the Python bindings

tests/CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,30 @@ add_dependencies(tests quicked_harness)
88

99
# Add the tests
1010
add_test(NAME test_empty COMMAND $<TARGET_FILE:quicked_harness> "" "")
11-
set_property(TEST test_empty PROPERTY PASS_REGULAR_EXPRESSION "ERROR: Tried to align an empty sequence")
11+
set_tests_properties(test_empty PROPERTIES PASS_REGULAR_EXPRESSION "ERROR: Tried to align an empty sequence")
1212

1313
add_test(NAME test_nonDNA COMMAND $<TARGET_FILE:quicked_harness> "GATC" "GATO" 1)
1414

1515
if(UNIX)
1616
set(RANDOM_TEST_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/random_test.sh)
1717

1818
add_test(NAME test_l1000_n10000_e10 COMMAND ${RANDOM_TEST_SCRIPT} 1000 10000 10 quicked_harness)
19-
set_property(TEST test_l1000_n10000_e10 PROPERTY
19+
set_tests_properties(test_l1000_n10000_e10 PROPERTIES
2020
ENVIRONMENT "BIN_DIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
2121

2222
add_test(NAME test_l10000_n1000_e10 COMMAND ${RANDOM_TEST_SCRIPT} 10000 1000 10 quicked_harness)
23-
set_property(TEST test_l10000_n1000_e10 PROPERTY
23+
set_tests_properties(test_l10000_n1000_e10 PROPERTIES
2424
ENVIRONMENT "BIN_DIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
2525

2626
add_test(NAME test_l100000_n100_e10 COMMAND ${RANDOM_TEST_SCRIPT} 100000 100 10 align_benchmark)
27-
set_property(TEST test_l100000_n100_e10 PROPERTY
27+
set_tests_properties(test_l100000_n100_e10 PROPERTIES
2828
ENVIRONMENT "BIN_DIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
2929

3030
add_test(NAME test_l1000000_n10_e10 COMMAND ${RANDOM_TEST_SCRIPT} 1000000 10 10 align_benchmark)
31-
set_property(TEST test_l1000000_n10_e10 PROPERTY FAIL_REGULAR_EXPRESSION "INACCURATE SCORE")
32-
set_property(TEST test_l1000000_n10_e10 PROPERTY
31+
set_tests_properties(test_l1000000_n10_e10 PROPERTIES FAIL_REGULAR_EXPRESSION "INACCURATE SCORE")
32+
set_tests_properties(test_l1000000_n10_e10 PROPERTIES
3333
ENVIRONMENT "BIN_DIR=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
3434
endif()
3535

3636
add_test(NAME test_MiniION_align_benchmark COMMAND $<TARGET_FILE:align_benchmark> -i ${CMAKE_CURRENT_SOURCE_DIR}/test_data/ONT.MiniION.1.seq -c "score" -v)
37-
set_property(TEST test_MiniION_align_benchmark PROPERTY FAIL_REGULAR_EXPRESSION "INACCURATE SCORE")
37+
set_tests_properties(test_MiniION_align_benchmark PROPERTIES FAIL_REGULAR_EXPRESSION "INACCURATE SCORE")

0 commit comments

Comments
 (0)