[neon/extras/kstars/Neon/release] debian: stop running the test suite at build time

Pino Toscano null at kde.org
Tue Nov 1 11:10:31 GMT 2022


Git commit 62beba52157bea0edc019d3752fca9db7b7bcff8 by Pino Toscano.
Committed on 12/12/2021 at 12:34.
Pushed by jriddell into branch 'Neon/release'.

stop running the test suite at build time

M  +7    -0    debian/changelog
M  +0    -1    debian/control
D  +0    -2    debian/patches/series
D  +0    -37   debian/patches/skip-installed-tests.diff
D  +0    -18   debian/patches/skip-skypoint-test.diff
M  +5    -0    debian/rules

https://invent.kde.org/neon/extras/kstars/commit/62beba52157bea0edc019d3752fca9db7b7bcff8

diff --git a/debian/changelog b/debian/changelog
index b452bde..3c5f45c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,13 @@ kstars (5:3.5.6-2) UNRELEASED; urgency=medium
   * Set field Upstream-Contact in debian/copyright.
   * Remove obsolete field Contact from debian/upstream/metadata (already present
     in machine-readable debian/copyright).
+  * Stop executing the test suite at build time, as it is becoming more and more
+    complex, unstable, and relying on an already installed kstars:
+    - drop the liberfa-dev build dependency, needed only for some tests
+    - pass -DBUILD_TESTING=OFF to cmake to not build it
+    - disable the override_dh_auto_test target
+    - drop the patches skip-skypoint-test.diff, and skip-installed-tests.diff,
+      as they affect only the tests
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 12 Dec 2021 09:35:28 +0100
 
diff --git a/debian/control b/debian/control
index 6642707..6d7d615 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: cmake (>= 3.10.0~),
                kinit-dev (>= 5.44.0~),
                libcfitsio-dev (>= 3.040),
                libeigen3-dev (>> 2.0.3),
-               liberfa-dev,
                libglu1-mesa-dev [!armhf],
                libgsl-dev,
                libindi-dev (>= 1.9.1~),
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8cbadc0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-skip-skypoint-test.diff
-skip-installed-tests.diff
diff --git a/debian/patches/skip-installed-tests.diff b/debian/patches/skip-installed-tests.diff
deleted file mode 100644
index 93b9cbc..0000000
--- a/debian/patches/skip-installed-tests.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Disable tests that assume installed files
- The test suite is run on the uninstalled built sources, so a test that checks
- for installed files cannot work (and partially it does not make sense).
-Forwarded: no
-Last-Update: 2021-09-16
-
---- a/Tests/auxiliary/testkspaths.cpp
-+++ b/Tests/auxiliary/testkspaths.cpp
-@@ -120,6 +120,7 @@ void TestKSPaths::testStandardPaths()
- #endif
- }
- 
-+#if 0
- void TestKSPaths::testKStarsInstallation_data()
- {
- #if QT_VERSION < 0x050900
-@@ -158,5 +159,6 @@ void TestKSPaths::testKStarsInstallation
-     QVERIFY(!KSPaths::locateAll(TYPE, FILE).isEmpty());
- #endif
- }
-+#endif
- 
- QTEST_GUILESS_MAIN(TestKSPaths)
---- a/Tests/auxiliary/testkspaths.h
-+++ b/Tests/auxiliary/testkspaths.h
-@@ -31,8 +31,10 @@ private slots:
-     void testStandardPaths_data();
-     void testStandardPaths();
- 
-+#if 0
-     void testKStarsInstallation_data();
-     void testKStarsInstallation();
-+#endif
- };
- 
- #endif // TESTKSPATHS_H
diff --git a/debian/patches/skip-skypoint-test.diff b/debian/patches/skip-skypoint-test.diff
deleted file mode 100644
index c540aed..0000000
--- a/debian/patches/skip-skypoint-test.diff
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Pino Toscano <pino at debian.org>
-Description: Skip failing TestSkyPoint::testUpdateCoords() test
- QDEBUG : TestSkyPoint::testUpdateCoords() i 1  jdfrac 0.5 : sp ra0  178.867 , dec  -89.8839  ra  260.642 , dec  -90.0001
- FAIL!  : TestSkyPoint::testUpdateCoords() 'fabs(sp.dec().Degrees()) <= 90.0' returned FALSE. ()
-    Loc: [./Tests/skyobjects/test_skypoint.cpp(579)]
-Last-Update: 2021-09-16
-Forwarded: not-needed
-
---- a/Tests/skyobjects/test_skypoint.cpp
-+++ b/Tests/skyobjects/test_skypoint.cpp
-@@ -588,6 +588,7 @@ void TestSkyPoint::ln_get_equ_nut(ln_equ
- 
- void TestSkyPoint::testUpdateCoords()
- {
-+    QSKIP("fails, unclear why");
-     Options::setUseRelativistic(false);
- 
-     dms ra, dec;
diff --git a/debian/rules b/debian/rules
index 96b0dd1..ecb6a93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,11 @@ endif
 %:
 	dh $@ --with kf5
 
+override_dh_auto_configure:
+	dh_auto_configure -Skf5 -- -DBUILD_TESTING=OFF
+
 execute_after_dh_auto_install:
 	# remove development stuff
 	find debian/tmp -name '*.a' -delete
+
+.PHONY: override_dh_auto_test



More information about the Neon-commits mailing list