[med-svn] [Git][med-team/dcmtk][master] 2 commits: Prevent bashism in run-unit-test

[Andreas Tille (@tille)]

Andreas Tille pushed to branch master at Debian Med / dcmtk


Commits:
1de8f04a by Andreas Tille at 2022-09-28T15:08:06+02:00
Prevent bashism in run-unit-test

- - - - -
5eae20a2 by Andreas Tille at 2022-09-28T15:09:24+02:00
Enable running run-unit-test from any directory

- - - - -


2 changed files:

- debian/changelog
- debian/tests/run-unit-test


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+dcmtk (3.6.7-7) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Prevent bashism in run-unit-test
+  * Enable running run-unit-test from any directory
+
+ -- Andreas Tille <tille at debian.org>  Wed, 28 Sep 2022 15:07:43 +0200
+
 dcmtk (3.6.7-6) unstable; urgency=medium
 
   [ Mathieu Malaterre ]


=====================================
debian/tests/run-unit-test
=====================================
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 pkg=dcmtk
@@ -13,74 +13,74 @@ if [ "${AUTOPKGTEST_TMP}" = "" ] ; then
 fi
 
 cp -a /usr/lib/python3/dist-packages/pydicom/data/test_files/CT_small.dcm "${AUTOPKGTEST_TMP}"
-cp -a ${CUR_DIR}/dcmdata/data/dicom.dic "${AUTOPKGTEST_TMP}"
+cp -a /usr/share/libdcmtk17/dicom.dic "${AUTOPKGTEST_TMP}"
 
 
 export DCMDICTPATH=${AUTOPKGTEST_TMP}/dicom.dic
 
 cd "${AUTOPKGTEST_TMP}"
 
-echo -e "15e7e2a11cdeabac32e1134674beda6b  CT_small.dcm" >> checksums
+echo "15e7e2a11cdeabac32e1134674beda6b  CT_small.dcm" >> checksums
 
-echo -e "Running Tests"
+echo "Running Tests"
 
-echo -e "Test 1"
+echo "Test 1"
 
 dcm2json CT_small.dcm dcm2json.json
 
-echo -e "Test 2"
+echo "Test 2"
 
 dcm2xml CT_small.dcm dcm2xml.xml
 
-echo -e "Test 3"
+echo "Test 3"
 
 dcmconv --convert-to-latin1 CT_small.dcm dcmconv.out
 
-echo -e "Test 4"
+echo "Test 4"
 
 dcmcrle CT_small.dcm dcmcrle.out
 
-echo -e "Test 5"
+echo "Test 5"
 
 dcmdrle dcmcrle.out dcmdrle.out
 
-echo -e "Test 6"
+echo "Test 6"
 
 dcmdump CT_small.dcm > dcmdump.out
 
-echo -e "Test 7"
+echo "Test 7"
 
 dump2dcm dcmdump.out dump2dcm.dcm
 
-echo -e "Test 8"
+echo "Test 8"
 
 dcmftest CT_small.dcm
 
-echo -e "Test 9"
+echo "Test 9"
 
 dcmodify -e "(0008,0031)" CT_small.dcm
 
-echo -e "Test 10"
+echo "Test 10"
 
 dcm2pnm +Rtd CT_small.dcm dcm2pnm.png
 
-echo -e "Test 11"
+echo "Test 11"
 
 dcmscale +Sxf 2.0 CT_small.dcm dcmscale.out
 
-echo -e "Test 12"
+echo "Test 12"
 
 dcmcjpls CT_small.dcm dcmcjpls.out
 
-echo -e "Test 13"
+echo "Test 13"
 
 dcmdjpls dcmcjpls.out dcmdjpls.out
 
-echo -e "Test 14"
+echo "Test 14"
 
 dcml2pnm  CT_small.dcm dcml2pnm.png
 
-echo -e "Test 15"
+echo "Test 15"
 
 cat <<EOT >> crv.txt
  256.451947    1.000000
@@ -92,23 +92,23 @@ EOT
 
 dcmmkcrv CT_small.dcm crv.txt dcmmkcrv.out
 
-echo -e "Test 16"
+echo "Test 16"
 
 dcmmklut dcmmklut.out
 
-echo -e "Test 17"
+echo "Test 17"
 
 dcmp2pgm CT_small.dcm dcmp2pgm.out
 
-echo -e "Test 18"
+echo "Test 18"
 dcmpsmk CT_small.dcm dcmpsmk.out
 
-echo -e "Test 19"
+echo "Test 19"
 mkdir dcmqridx
 
 dcmqridx dcmqridx/ CT_small.dcm
 
-echo -e "Test 20"
+echo "Test 20"
 dcmsign -q CT_small.dcm
 
 if [ -f dcmqridx/index.dat ] && \
@@ -130,7 +130,7 @@ if [ -f dcmqridx/index.dat ] && \
    [ -f dcmp2pgm.out ] && \
    md5sum --check checksums; then
 
-   echo -e "PASS"
+   echo "PASS"
 
 else
    echo "FAIL"



View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/28440ec00490849beaaef6e4f9e08106041a8944...5eae20a204707db4bf32922b81d1e3fedaf481b4

-- 
View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/compare/28440ec00490849beaaef6e4f9e08106041a8944...5eae20a204707db4bf32922b81d1e3fedaf481b4
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/20220928/de69486b/attachment-0001.htm>