[med-svn] [Git][med-team/dicomscope][master] 2 commits: drop redundant fields

[harish chavre (@Harish1)]

harish chavre pushed to branch master at Debian Med / dicomscope


Commits:
79b80ec2 by Harish Chavre at 2026-02-19T15:58:56+05:30
drop redundant fields

- - - - -
0eec5ad7 by Harish Chavre at 2026-02-19T15:59:28+05:30
fix autopkgtest

- - - - -


2 changed files:

- debian/control
- debian/tests/run-unit-test


Changes:

=====================================
debian/control
=====================================
@@ -5,7 +5,6 @@ Uploaders:
  Andreas Tille <tille at debian.org>,
  Gert Wollny <gewo at debian.org>,
 Section: graphics
-Priority: optional
 Build-Depends:
  debhelper-compat (= 13),
  cmake,
@@ -16,7 +15,6 @@ Build-Depends:
 Vcs-Browser: https://salsa.debian.org/med-team/dicomscope
 Vcs-Git: https://salsa.debian.org/med-team/dicomscope.git
 Homepage: https://dicom.offis.de/dscope.php.en
-Rules-Requires-Root: no
 
 Package: dicomscope
 Architecture: all


=====================================
debian/tests/run-unit-test
=====================================
@@ -1,35 +1,39 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 bin="dicomscope"
 TESTFILE="/usr/share/dicomscope/reports/reportsi.dcm"
 
-if [ -z "$AUTOPKGTEST_TMP" ]; then
-  AUTOPKGTEST_TMP=$(mktemp -d /tmp/${bin}-test.XXXXXX)
+if [ "$AUTOPKGTEST_TMP" = "" ] ; then
+  AUTOPKGTEST_TMP=`mktemp -d /tmp/${bin}-test.XXXXXX`
   trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
 fi
 
 check_n_cleanup () {
-    local program_pids="$(
-        ps aux \
-        | awk "/^$USER"'.*dicomscope/ {print $2}' \
-        | xargs
-    )"
-
-    local xvfb_pids="$(
-        ps aux \
-        | awk -vORS=' ' "/^$USER"'.*[X]vfb/ {print $2}' \
-        | xargs
-    )"
-
-   # [ -n "$program_pids" ] && kill $program_pids || true
-    [ -n "$xvfb_pids" ] && kill $xvfb_pids || true
+	local program_pid="$(
+
+		ps aux \
+		| awk "/^$USER"'.*java .*DICOMscope.jar/ {print$2; exit}'
+	)"
+
+	local xvfb_pids="$(
+		ps aux \
+		| awk -vORS=' ' "/^$USER"'.*[X]vfb/ {print$2}'
+	)"
+
+	if [ -n "$program_pid" ]
+	then
+		kill "$program_pid"
+	else
+		printf -- "error: $bin crashed before the end of the test\n" >&2
+		exit 1
+	fi
+	test -n "$xvfb_pids" && kill $xvfb_pids
 }
 
 cd "$AUTOPKGTEST_TMP"
 
 set -v
-xvfb-run --auto-servernum /usr/bin/dicomscope "$TESTFILE" 2>&1 &
-sleep  30
+xvfb-run --auto-servernum "/usr/bin/$bin" "$TESTFILE" 2>&1 &
+sleep 30
 check_n_cleanup
-



View it on GitLab: https://salsa.debian.org/med-team/dicomscope/-/compare/91f2c6f496cf007ecc1d81d407c1c5333002ee91...0eec5ad79cf4221dd8170a9939947ca2d9fd0771

-- 
View it on GitLab: https://salsa.debian.org/med-team/dicomscope/-/compare/91f2c6f496cf007ecc1d81d407c1c5333002ee91...0eec5ad79cf4221dd8170a9939947ca2d9fd0771
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/20260219/be9eba76/attachment-0001.htm>