diff options
author | Gard Spreemann <gspreemann@gmail.com> | 2017-04-26 13:40:19 +0200 |
---|---|---|
committer | Gard Spreemann <gspreemann@gmail.com> | 2017-04-26 13:40:19 +0200 |
commit | 6baddd33216cf66fd8ce5e415d1d3ad8444af0d6 (patch) | |
tree | 65c405c5b7d9d84986a916444ed38e2b56380f51 /debian | |
parent | 34f6a4d24e5db24c928905df9fa17c84092d7a95 (diff) |
Add patch to disable tests using deleted data files.
Diffstat (limited to 'debian')
3 files changed, 65 insertions, 3 deletions
diff --git a/debian/patches/0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch b/debian/patches/0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch index 463e13d1..c4b39f01 100644 --- a/debian/patches/0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch +++ b/debian/patches/0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch @@ -1,8 +1,8 @@ -From 1ecf2bf414b0cacf43fb05e4ba33528c7cfc04a1 Mon Sep 17 00:00:00 2001 +From d453ab3742d87c3c1e985db3899f1085cd57829a Mon Sep 17 00:00:00 2001 From: Gard Spreemann <gspreemann@gmail.com> Date: Fri, 21 Apr 2017 11:55:21 +0200 -Subject: [PATCH] Disable some tests that uncleanly write outside of the build - directory. +Subject: [PATCH 1/2] Disable some tests that uncleanly write outside of the + build directory. --- example/Bitmap_cubical_complex/CMakeLists.txt | 21 +++++++++++---------- diff --git a/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch b/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch new file mode 100644 index 00000000..78a83a08 --- /dev/null +++ b/debian/patches/0002-Disable-tests-that-use-DFSG-deleted-data-files.patch @@ -0,0 +1,61 @@ +From d20e6c35c1365da5b13c771fd8bf2f3a9902391e Mon Sep 17 00:00:00 2001 +From: Gard Spreemann <gspreemann@gmail.com> +Date: Wed, 26 Apr 2017 13:37:46 +0200 +Subject: [PATCH 2/2] Disable tests that use DFSG-deleted data files. + +--- + example/Persistent_cohomology/CMakeLists.txt | 8 ++++---- + example/Simplex_tree/CMakeLists.txt | 4 ++-- + example/common/CMakeLists.txt | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/example/Persistent_cohomology/CMakeLists.txt b/example/Persistent_cohomology/CMakeLists.txt +index 3c45e79..abd71a5 100644 +--- a/example/Persistent_cohomology/CMakeLists.txt ++++ b/example/Persistent_cohomology/CMakeLists.txt +@@ -43,10 +43,10 @@ add_test(NAME Persistent_cohomology_example_from_rips_step_by_step_on_tore_3D CO + "${CMAKE_SOURCE_DIR}/data/points/tore3D_1307.off" "-r" "0.25" "-m" "0.5" "-d" "3" "-p" "3") + add_test(NAME Persistent_cohomology_example_via_boundary_matrix COMMAND $<TARGET_FILE:rips_persistence_via_boundary_matrix> + "${CMAKE_SOURCE_DIR}/data/points/Kl.off" "-r" "0.16" "-d" "3" "-p" "3" "-m" "100") +-add_test(NAME Persistent_cohomology_example_from_file_3_2_0 COMMAND $<TARGET_FILE:persistence_from_file> +- "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "2" "-m" "0") +-add_test(NAME Persistent_cohomology_example_from_file_3_3_100 COMMAND $<TARGET_FILE:persistence_from_file> +- "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "3" "-m" "100") ++#add_test(NAME Persistent_cohomology_example_from_file_3_2_0 COMMAND $<TARGET_FILE:persistence_from_file> ++# "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "2" "-m" "0") ++#add_test(NAME Persistent_cohomology_example_from_file_3_3_100 COMMAND $<TARGET_FILE:persistence_from_file> ++# "${CMAKE_SOURCE_DIR}/data/filtered_simplicial_complex/bunny_5000_complex.fsc" "-p" "3" "-m" "100") + + if(GMP_FOUND) + if(GMPXX_FOUND) +diff --git a/example/Simplex_tree/CMakeLists.txt b/example/Simplex_tree/CMakeLists.txt +index b1ea98d..3acf6f0 100644 +--- a/example/Simplex_tree/CMakeLists.txt ++++ b/example/Simplex_tree/CMakeLists.txt +@@ -27,6 +27,6 @@ if(GMP_FOUND AND CGAL_FOUND) + if (TBB_FOUND) + target_link_libraries(Simplex_tree_example_alpha_shapes_3_from_off ${TBB_LIBRARIES}) + endif() +- add_test(NAME Simplex_tree_example_alpha_shapes_3_from_off COMMAND $<TARGET_FILE:Simplex_tree_example_alpha_shapes_3_from_off> +- "${CMAKE_SOURCE_DIR}/data/points/bunny_5000.off") ++ #add_test(NAME Simplex_tree_example_alpha_shapes_3_from_off COMMAND $<TARGET_FILE:Simplex_tree_example_alpha_shapes_3_from_off> ++ # "${CMAKE_SOURCE_DIR}/data/points/bunny_5000.off") + endif() +diff --git a/example/common/CMakeLists.txt b/example/common/CMakeLists.txt +index d5311b1..91ab206 100644 +--- a/example/common/CMakeLists.txt ++++ b/example/common/CMakeLists.txt +@@ -3,8 +3,8 @@ project(Common_examples) + + add_executable ( vector_double_off_reader example_vector_double_points_off_reader.cpp ) + target_link_libraries(vector_double_off_reader ${Boost_SYSTEM_LIBRARY} ${CGAL_LIBRARY}) +-add_test(NAME Common_example_vector_double_off_reader COMMAND $<TARGET_FILE:vector_double_off_reader> +- "${CMAKE_SOURCE_DIR}/data/points/SO3_10000.off") ++#add_test(NAME Common_example_vector_double_off_reader COMMAND $<TARGET_FILE:vector_double_off_reader> ++# "${CMAKE_SOURCE_DIR}/data/points/SO3_10000.off") + + if(CGAL_FOUND) + add_executable ( cgal_3D_off_reader example_CGAL_3D_points_off_reader.cpp ) +-- +2.11.0 + diff --git a/debian/patches/series b/debian/patches/series index 3b2c6c02..c998d3eb 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-Disable-some-tests-that-uncleanly-write-outside-of-t.patch +0002-Disable-tests-that-use-DFSG-deleted-data-files.patch |