[med-svn] [Git][med-team/edtsurf][master] 3 commits: Run only the less computing time requesting test on i386

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / edtsurf


Commits:
d009c03d by Andreas Tille at 2020-11-12T17:24:56+01:00
Run only the less computing time requesting test on i386

- - - - -
acea1222 by Andreas Tille at 2020-11-12T17:25:38+01:00
Remove obsolete fields Contact, Name from debian/upstream/metadata (already present in machine-readable debian/copyright).

Changes-By: lintian-brush

- - - - -
ff9f5ba4 by Andreas Tille at 2020-11-12T17:27:23+01:00
routine-update: Ready to upload to unstable

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+edtsurf (0.2009-8) unstable; urgency=medium
+
+  * Run only the less computing time requesting test on i386
+    Closes: #974555
+  * Remove obsolete fields Contact, Name from debian/upstream/metadata (already
+    present in machine-readable debian/copyright).
+
+ -- Andreas Tille <tille at debian.org>  Thu, 12 Nov 2020 17:25:39 +0100
+
 edtsurf (0.2009-7) unstable; urgency=medium
 
   [ Pranav Ballaney ]


=====================================
debian/tests/run-unit-test
=====================================
@@ -18,16 +18,21 @@ ls -R
 
 cd data
 
-echo -e "\e[93m\e[1mTest 1\e[0m"
-EDTSurf -i 4we2.pdb
-
-echo "5a8f743a66963e9939773cce4dd68063  4we2-cav.pdb" > checksums
-echo "1e12bc9a1180027990d7b16497af051b  4we2.ply" >> checksums
-md5sum --check checksums
-
-echo -e "\e[92m\e[1mPassed\e[0m"
-echo
+if [ $(dpkg-architecture -qDEB_HOST_ARCH) = i386 ] ; then
+  echo "This test will timeout on i386 (see bug #974555) so do not run it here."
+else
+  echo -e "\e[93m\e[1mTest 1\e[0m"
+  EDTSurf -i 4we2.pdb
+
+  echo "5a8f743a66963e9939773cce4dd68063  4we2-cav.pdb" > checksums
+  echo "1e12bc9a1180027990d7b16497af051b  4we2.ply" >> checksums
+  md5sum --check checksums
+
+  echo -e "\e[92m\e[1mPassed\e[0m"
+  echo
+fi
 
+# This test seems to make the less effort computing time wise so it should be possible on all architectures
 echo -e "\e[93m\e[1mTest 2\e[0m"
 EDTSurf -i 4we2.pdb -t 2 -o 4we2-vcmc-ms
 
@@ -38,23 +43,27 @@ md5sum --check checksums
 echo -e "\e[92m\e[1mPassed\e[0m"
 echo
 
-echo -e "\e[93m\e[1mTest 3\e[0m"
-EDTSurf -i 4we2.pdb -s 1 -t 1 -o 4we2-mc-vws
+if [ $(dpkg-architecture -qDEB_HOST_ARCH) = i386 ] ; then
+  echo "This test will timeout on i386 (see bug #974555) so do not run it here."
+else
+  echo -e "\e[93m\e[1mTest 3\e[0m"
+  EDTSurf -i 4we2.pdb -s 1 -t 1 -o 4we2-mc-vws
 
-echo "6c58df9e481d7acc476ac49b05ccf71a  4we2-mc-vws-cav.pdb" > checksums
-echo "3fcf6ee03320d65165f6b69829184523  4we2-mc-vws.ply" >> checksums
-md5sum --check checksums
+  echo "6c58df9e481d7acc476ac49b05ccf71a  4we2-mc-vws-cav.pdb" > checksums
+  echo "3fcf6ee03320d65165f6b69829184523  4we2-mc-vws.ply" >> checksums
+  md5sum --check checksums
 
-echo -e "\e[92m\e[1mPassed\e[0m"
-echo
+  echo -e "\e[92m\e[1mPassed\e[0m"
+  echo
 
-echo -e "\e[93m\e[1mTest 4\e[0m"
-EDTSurf -i 4we2.pdb -s 2 -t 2 -c 3 -o 4we2-sas-vcmc-chain
+  echo -e "\e[93m\e[1mTest 4\e[0m"
+  EDTSurf -i 4we2.pdb -s 2 -t 2 -c 3 -o 4we2-sas-vcmc-chain
 
-echo "e53d8f051ab37ddb2e8ea7f91b576046  4we2-sas-vcmc-chain.asa" > checksums
-echo "a5c9f8506b7a19598abdd4d723b659d8  4we2-sas-vcmc-chain-cav.pdb" >> checksums
-echo "840499d9781b146e0144fdb597c73a8e  4we2-sas-vcmc-chain.ply" >> checksums
-md5sum --check checksums
+  echo "e53d8f051ab37ddb2e8ea7f91b576046  4we2-sas-vcmc-chain.asa" > checksums
+  echo "a5c9f8506b7a19598abdd4d723b659d8  4we2-sas-vcmc-chain-cav.pdb" >> checksums
+  echo "840499d9781b146e0144fdb597c73a8e  4we2-sas-vcmc-chain.ply" >> checksums
+  md5sum --check checksums
 
-echo -e "\e[92m\e[1mPassed\e[0m"
-echo
+  echo -e "\e[92m\e[1mPassed\e[0m"
+  echo
+fi


=====================================
debian/upstream/metadata
=====================================
@@ -1,5 +1,3 @@
-Name: edtsurf
-Contact: Yang Zhang <zhng at umich.edu>
 Reference:
  AUTHOR: Dong Xu and Yang Zhang
  TITLE: >



View it on GitLab: https://salsa.debian.org/med-team/edtsurf/-/compare/8b7591e1a1d4d00cf5614d4d6cab40768c357e22...ff9f5ba437b4e277db5744b824008a504e5a33ae

-- 
View it on GitLab: https://salsa.debian.org/med-team/edtsurf/-/compare/8b7591e1a1d4d00cf5614d4d6cab40768c357e22...ff9f5ba437b4e277db5744b824008a504e5a33ae
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/20201112/4c3f7284/attachment-0001.html>