[med-svn] [Git][med-team/bart][master] 4 commits: turn off another unit test for i386
Martin Uecker (@uecker-guest)
gitlab at salsa.debian.org
Mon Dec 11 18:12:06 GMT 2023
Martin Uecker pushed to branch master at Debian Med / bart
Commits:
ff83203e by Martin Uecker at 2023-12-11T19:11:15+01:00
turn off another unit test for i386
- - - - -
23a318f0 by Martin Uecker at 2023-12-11T19:11:22+01:00
run unit tests on alpha
- - - - -
971a639f by Martin Uecker at 2023-12-11T19:11:26+01:00
update standards version
- - - - -
6013b979 by Martin Uecker at 2023-12-11T19:11:31+01:00
clean up more thoroughly
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/patches/0002-deactivate-ode-unit-tests.patch
- debian/patches/0008-fix-command-line-processing.patch → debian/patches/0007-fix-command-line-processing.patch
- debian/patches/0009-fix-test-for-Debian.patch → debian/patches/0008-fix-test-for-Debian.patch
- + debian/patches/0009-clean-up-more-thoroughly.patch
- debian/patches/0010-turn-off-one-test-on-i386.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+bart (0.9.00-2) UNRELEASED; urgency=medium
+
+ * Turn off another unit test on i386 but activate ode_bloch for all.
+ * Run unit tests on alpha.
+ * Update Debian standards version.
+ * Add patch to properly clean up after built (Closes: #1044082)
+
+ -- Martin Uecker <uecker at tugraz> Mon, 11 Dec 2023 18:42:37 +0100
+
bart (0.9.00-1) unstable; urgency=medium
* New upstream version.
=====================================
debian/control
=====================================
@@ -8,7 +8,7 @@ Build-Depends: debhelper-compat (= 13),
liblapack-dev | liblapack.so,
libpng-dev,
liblapacke-dev
-Standards-Version: 4.6.1.0
+Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/med-team/bart
Vcs-Git: https://salsa.debian.org/med-team/bart.git
Homepage: https://mrirecon.github.io/bart/
=====================================
debian/patches/0002-deactivate-ode-unit-tests.patch deleted
=====================================
@@ -1,66 +0,0 @@
-From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
-Date: Tue, 11 Dec 2018 20:04:44 +0100
-Subject: deactivate ode unit tests
-
----
- utests/test_ode_bloch.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/utests/test_ode_bloch.c b/utests/test_ode_bloch.c
-index c991eb8..ac31956 100644
---- a/utests/test_ode_bloch.c
-+++ b/utests/test_ode_bloch.c
-@@ -92,7 +92,7 @@ static bool test_ode_bloch(void)
- #endif
- }
-
--UT_REGISTER_TEST(test_ode_bloch);
-+// UXT_REGISTER_TEST(test_ode_bloch);
-
-
-
-@@ -124,7 +124,7 @@ static bool test_bloch_matrix(void)
- && (0. == out2[3]);
- }
-
--UT_REGISTER_TEST(test_bloch_matrix);
-+// UXT_REGISTER_TEST(test_bloch_matrix);
-
-
-
-@@ -153,7 +153,7 @@ static bool test_ode_matrix_bloch(void)
- return (err2 < 1.E-6);
- }
-
--UT_REGISTER_TEST(test_ode_matrix_bloch);
-+// UXT_REGISTER_TEST(test_ode_matrix_bloch);
-
-
-
-@@ -228,7 +228,7 @@ static bool test_ode_sa(void)
- return err < 1.E-9;
- }
-
--UT_REGISTER_TEST(test_ode_sa);
-+// UXT_REGISTER_TEST(test_ode_sa);
-
-
- static bool test_ode_sa2(void)
-@@ -289,7 +289,7 @@ static bool test_ode_sa2(void)
- return true;
- }
-
--UT_REGISTER_TEST(test_ode_sa2);
-+// UXT_REGISTER_TEST(test_ode_sa2);
-
-
-
-@@ -344,7 +344,7 @@ static bool test_ode_sa_bloch(void)
- return true;
- }
-
--UT_REGISTER_TEST(test_ode_sa_bloch);
-+// UXT_REGISTER_TEST(test_ode_sa_bloch);
-
-
-
=====================================
debian/patches/0008-fix-command-line-processing.patch → debian/patches/0007-fix-command-line-processing.patch
=====================================
=====================================
debian/patches/0009-fix-test-for-Debian.patch → debian/patches/0008-fix-test-for-Debian.patch
=====================================
=====================================
debian/patches/0009-clean-up-more-thoroughly.patch
=====================================
@@ -0,0 +1,26 @@
+From: Martin Uecker <martin.uecker at med.uni-goettingen.de>
+Date: Mon, 11 Dec 2023 19:02:20 +0100
+Subject: clean up more thoroughly
+
+---
+ Makefile | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index b82544b..5722ddd 100644
+--- a/Makefile
++++ b/Makefile
+@@ -825,10 +825,13 @@ clean:
+
+ allclean: clean
+ rm -f $(libdir)/*.a $(ALLDEPS)
++ rm -f $(root)/.*.d
+ rm -f bart
+ rm -f $(patsubst %, %, $(CTARGETS))
+ rm -f $(srcdir)/misc/version.inc
+ rm -rf $(root)/tests/tmp/*/
++ rm -rf $(root)/tests/tests-*
++ rm -rf $(root)/tests/out/*/
+ rm -rf $(root)/stests/tmp/*/
+ rm -rf $(root)/doc/dx
+ # rm -f $(root)/doc/commands.txt
=====================================
debian/patches/0010-turn-off-one-test-on-i386.patch
=====================================
@@ -3,22 +3,32 @@ Date: Mon, 24 Oct 2022 16:48:57 +0200
Subject: turn off one test on i386
---
- Makefile | 5 +++++
- 1 file changed, 5 insertions(+)
+ Makefile | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
-index 40d1653..7292f3d 100644
+index 40d1653..b82544b 100644
--- a/Makefile
+++ b/Makefile
+@@ -680,7 +680,7 @@ MODULES_test_nufft += -lnoncart -llinops
+ MODULES_test_fib += -lnoncart
+
+ # lib num
+-UTARGETS += test_multind test_flpmath test_splines test_linalg test_polynom test_window test_conv test_ode test_nlmeans test_rand
++UTARGETS += test_multind test_flpmath test_splines test_linalg test_polynom test_window test_conv test_nlmeans test_rand
+ UTARGETS += test_blas test_mdfft test_ops test_ops_p test_flpmath2 test_convcorr test_specfun test_qform test_fft test_gaussians
+ ifeq ($(MPI),1)
+ UTARGETS += test_mpi test_mpi_multind test_mpi_flpmath test_mpi_fft
@@ -688,7 +688,12 @@ endif
UTARGETS_GPU += test_cudafft test_cuda_flpmath test_cuda_flpmath2 test_cuda_gpukrnls test_cuda_convcorr test_cuda_multind test_cuda_shuffle test_cuda_memcache_clear
# lib simu
+-UTARGETS += test_ode_bloch test_ode_simu test_biot_savart test_signals test_epg test_pulse
+ifeq ($(ODE_SIMU_OFF),1)
-+# FIXME: test_ode_simu and test_pulse hang on i386, turn off for now
++# FIXME: test_ode_simu, test_ode, and test_pulse hang on i386, turn off for now
+UTARGETS += test_ode_bloch test_biot_savart test_signals test_epg
+else
- UTARGETS += test_ode_bloch test_ode_simu test_biot_savart test_signals test_epg test_pulse
++UTARGETS += test_ode_bloch test_ode test_ode_simu test_biot_savart test_signals test_epg test_pulse
+endif
MODULES_test_ode_bloch += -lsimu
MODULES_test_ode_simu += -lsimu
=====================================
debian/patches/series
=====================================
@@ -1,9 +1,9 @@
0001-remove-empty-directory.patch
-0002-deactivate-ode-unit-tests.patch
0003-relax-failing-unit-test.patch
0005-do-not-update-doc-commands.txt-automatically.patch
0006-on-Deban-never-use-git-version.patch
0007-add-CXXFLAGS-to-nvcc-to-fix-C-build-issue.patch
0010-turn-off-one-test-on-i386.patch
-0008-fix-command-line-processing.patch
-0009-fix-test-for-Debian.patch
+0007-fix-command-line-processing.patch
+0008-fix-test-for-Debian.patch
+0009-clean-up-more-thoroughly.patch
=====================================
debian/rules
=====================================
@@ -29,7 +29,7 @@ endif
NOTEST_ARCHS=hurd-i386 kfreebsd-i386
# For this architesture the test will be run but it will pass in any case even when errors occure
-PRINT_ERRORS_WHEN_TESTING=alpha sh4 arc m68k
+PRINT_ERRORS_WHEN_TESTING=sh4 arc m68k
%:
dh $@
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/02782af024f6fd61cf319a1dfb966cc809df43e3...6013b97911e6b4f7606151bfbd2e435b0fc20618
--
View it on GitLab: https://salsa.debian.org/med-team/bart/-/compare/02782af024f6fd61cf319a1dfb966cc809df43e3...6013b97911e6b4f7606151bfbd2e435b0fc20618
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20231211/5fb84b5a/attachment-0001.htm>
More information about the debian-med-commit
mailing list