[med-svn] [dcmtkpp] 01/01: Fix #807675

[Julien Lamy]

This is an automated email from the git hooks/post-receive script.

lamy-guest pushed a commit to branch master
in repository dcmtkpp.

commit 7ea7acbefcf8396100b97cb6f0cad0b8e1fe1eff
Author: Julien Lamy <lamy at unistra.fr>
Date:   Sun Dec 13 17:15:48 2015 +0100

    Fix #807675
---
 debian/changelog            |  8 +++++++-
 debian/patches/807675.patch | 50 +++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series       |  1 +
 debian/rules                |  2 +-
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aec35f3..2b9c1d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,10 @@
-dcmtkpp (0.3.1-2) UNRELEASED; urgency=medium
+dcmtkpp (0.3.1-3) unstable; urgency=medium
+
+  * Disable network-related tests at build time (Closes: #807675)
+
+ -- Julien Lamy <lamy at unistra.fr>  Sun, 13 Dec 2015 16:34:21 +0100
+
+dcmtkpp (0.3.1-2) unstable; urgency=medium
 
   * build-depend on libdcmtk (Closes: #804570)
 
diff --git a/debian/patches/807675.patch b/debian/patches/807675.patch
new file mode 100644
index 0000000..615456d
--- /dev/null
+++ b/debian/patches/807675.patch
@@ -0,0 +1,50 @@
+Subject: Disable network tests
+Author: Julien Lamy <lamy at unistra.fr>
+--- a/tests/run.sh
++++ b/tests/run.sh
+@@ -3,6 +3,13 @@
+ set -e
+ set -u
+ 
++if [ "${1:-}" = "--no-network" ]
++then
++    network="no"
++else
++    network="yes"
++fi
++
+ configure() {
+     cat > ${directory}/config  << EOF
+ HostTable BEGIN
+@@ -40,18 +47,23 @@ clean() {
+     rm -rf ${directory}
+ }
+ 
+-directory=$(mktemp -d dcmtkpp.XXX)
+-configure
+-start_scp
+-add_data
++if [ ${network} = "yes" ]
++then
++    directory=$(mktemp -d dcmtkpp.XXX)
++    configure
++    start_scp
++    add_data
++fi
+ 
+ export DCMTKPP_OWN_AET=LOCAL
+ export DCMTKPP_PEER_HOST_NAME=localhost
+ export DCMTKPP_PEER_PORT=11112
+ export DCMTKPP_PEER_AET=REMOTE
+ 
+-ctest --no-compress-output -T Test || true
+-
+-stop_scp
+-clean
++ctest --no-compress-output -T Test $@ || true
+ 
++if [ ${network} = "yes" ]
++then
++    stop_scp
++    clean
++fi
diff --git a/debian/patches/series b/debian/patches/series
index cbb7140..3eaaec9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix-tests-boost1.56.patch
 804570.patch
+807675.patch
diff --git a/debian/rules b/debian/rules
index e3359c7..42b7c70 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ override_dh_auto_build:
 	doxygen && mv doc build
 
 override_dh_auto_test:
-	cd build && ../tests/run.sh
+	cd build && ../tests/run.sh --no-network -E 'Association|Network|ServiceRole|SCP|SCU'
 
 override_dh_install:
 	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dcmtkpp.git