On Sun, Mar 18, 2018 at 03:12:34PM +0100, Paul Gevers wrote: > I would rather have somebody knowlegdeable first judge if really all > combination need to be run, or if a reduced set is good enough. As I > believe my fixup will waste needless time on the ci network.
Well, only some knowledge; Petter's feedback appreciated. While yet another desktop (LXQt having been added for Buster) should be added, the number of combinations could be reduced if only KDE is tested with all profiles. I figure there'll be enough information if the 'Workstation' profile gets tested for the remaining desktops. Patch attached. Wolfgang
From 8c7296927df5dc43c1bee1858c838b4af1b422da Mon Sep 17 00:00:00 2001
From: Wolfgang Schweer <wschw...@arcor.de>
Date: Thu, 29 Mar 2018 20:50:34 +0200
Subject: [PATCH 1/2] Add lxqt to the list of desktops to test.
---
debian/tests/test-tasksel-desktop | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/tests/test-tasksel-desktop b/debian/tests/test-tasksel-desktop
index ab4bac05..843c6cda 100644
--- a/debian/tests/test-tasksel-desktop
+++ b/debian/tests/test-tasksel-desktop
@@ -13,7 +13,7 @@ error() { error=1; echo error: "$@"; }
echo debian-edu-install debian-edu-install/profile multiselect Workstation \
| debconf-set-selections
-for desktop in kde gnome lxde xfce mate ; do
+for desktop in kde gnome lxde xfce mate lxqt ; do
echo tasksel tasksel/desktop multiselect "$desktop" \
| debconf-set-selections
wanted="education-desktop-$desktop"
--
2.16.3
From 78003dd1b3d93b97cdd9030e4ad67f2e710b752c Mon Sep 17 00:00:00 2001
From: Wolfgang Schweer <wschw...@arcor.de>
Date: Thu, 29 Mar 2018 20:52:50 +0200
Subject: [PATCH 2/2] Reduce number of test combinations; kde: full range,
others: only WORKSTATION.
---
debian/tests/control | 46 +---------------------------------------------
1 file changed, 1 insertion(+), 45 deletions(-)
diff --git a/debian/tests/control b/debian/tests/control
index d651e873..5095fe94 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -30,62 +30,18 @@ Test-Command: PROFILE=Workstation DESKTOP=gnome debian/tests/test-metapkgs
Depends: education-common, how-can-i-help
Restrictions: needs-root allow-stderr breaks-testbed
-Test-Command: PROFILE=Roaming-Workstation DESKTOP=gnome debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=LTSP-Server DESKTOP=gnome debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=Standalone DESKTOP=gnome debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
Test-Command: PROFILE=Workstation DESKTOP=lxde debian/tests/test-metapkgs
Depends: education-common, how-can-i-help
Restrictions: needs-root allow-stderr breaks-testbed
-Test-Command: PROFILE=Roaming-Workstation DESKTOP=lxde debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=LTSP-Server DESKTOP=lxde debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=Standalone DESKTOP=lxde debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
Test-Command: PROFILE=Workstation DESKTOP=xfce debian/tests/test-metapkgs
Depends: education-common, how-can-i-help
Restrictions: needs-root allow-stderr breaks-testbed
-Test-Command: PROFILE=Roaming-Workstation DESKTOP=xfce debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=LTSP-Server DESKTOP=xfce debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=Standalone DESKTOP=xfce debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
Test-Command: PROFILE=Workstation DESKTOP=mate debian/tests/test-metapkgs
Depends: education-common, how-can-i-help
Restrictions: needs-root allow-stderr breaks-testbed
-Test-Command: PROFILE=Roaming-Workstation DESKTOP=mate debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=LTSP-Server DESKTOP=mate debian/tests/test-metapkgs
-Depends: education-common, how-can-i-help
-Restrictions: needs-root allow-stderr breaks-testbed
-
-Test-Command: PROFILE=Standalone DESKTOP=mate debian/tests/test-metapkgs
+Test-Command: PROFILE=Workstation DESKTOP=lxqt debian/tests/test-metapkgs
Depends: education-common, how-can-i-help
Restrictions: needs-root allow-stderr breaks-testbed
--
2.16.3
signature.asc
Description: PGP signature
