[med-svn] [Git][med-team/scrm][master] 5 commits: Upload to unstable

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / scrm


Commits:
c11457fb by Andreas Tille at 2020-10-08T09:02:11+02:00
Upload to unstable

- - - - -
e2c469d5 by Andreas Tille at 2020-12-02T21:34:16+01:00
routine-update: Standards-Version: 4.5.1

- - - - -
a00e2106 by Andreas Tille at 2020-12-02T21:34:16+01:00
routine-update: debhelper-compat 13

- - - - -
aad1ece9 by Andreas Tille at 2020-12-02T22:07:00+01:00
Fix autopkgtest

- - - - -
3d3afebe by Andreas Tille at 2020-12-02T22:09:54+01:00
Merge changelog paragraphs

- - - - -


3 changed files:

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


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-scrm (1.7.4-1) UNRELEASED; urgency=medium
+scrm (1.7.4-1) unstable; urgency=medium
 
   * Team upload.
 
@@ -21,8 +21,11 @@ scrm (1.7.4-1) UNRELEASED; urgency=medium
   * Set upstream metadata fields: Bug-Database, Bug-Submit.
   * Remove obsolete field Name from debian/upstream/metadata (already
     present in machine-readable debian/copyright).
+  * Standards-Version: 4.5.1 (routine-update)
+  * debhelper-compat 13 (routine-update)
+  * Fix autopkgtest
 
- -- Samyak Jain <samyak.jn11 at gmail.com>  Fri, 13 Mar 2020 02:02:53 +0530
+ -- Andreas Tille <tille at debian.org>  Wed, 02 Dec 2020 21:34:16 +0100
 
 scrm (1.7.3-1) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -3,9 +3,9 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.
 Uploaders: Kevin Murray <spam at kdmurray.id.au>
 Section: science
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                libcppunit-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/med-team/scrm
 Vcs-Git: https://salsa.debian.org/med-team/scrm.git
 Homepage: https://github.com/scrm/scrm


=====================================
debian/tests/run-unit-test
=====================================
@@ -17,56 +17,25 @@ cp -a /usr/share/doc/${pkg}/examples/* "${AUTOPKGTEST_TMP}"
 cd "${AUTOPKGTEST_TMP}"
 gunzip -r *
 
-#cd tests/
-# Test the binaries using scrms build in debug checks
-if [ "$1" = "osx" ]; then
-  echo "On macOS => Skipping valgrind checks"
-  valgrind=0
-else
-  valgrind=1
-fi
-
-set -x
-make scrm scrm_dbg || exit 1
-make scrm_asan 2> /dev/null
 supports_sanitizers=$?
-if [ "$supports_sanitizers" == "0" ]; then
+if [ "$supports_sanitizers" = "0" ]; then
   echo "Using address sanitizers"
 fi
 
-function test_scrm {
+test_scrm () {
   echo -n " scrm $@ "
   for i in `seq 1 10`; do
     echo -n "."
 
     # Test using scrm self-checks
-    ./scrm_dbg $@ -seed $i > /dev/null
+    scrm $@ -seed $i > /dev/null
     if [ $? -ne 0 ]; then
       echo ""
-      echo "Executing \"./scrm_dbg $@ -seed $i\" failed."
+      echo "Executing \"./scrm $@ -seed $i\" failed."
       echo "Debug Call: make -mj2 scrm_dbg && ./scrm_dbg $@ -seed $i 2>&1 | less"
       exit 1
     fi
 
-    if [ "$supports_sanitizers" == "0" ]; then
-      ./scrm_asan $@ -seed $i > /dev/null
-      if [ $? -ne 0 ]; then
-        echo ""
-        echo "ASAN error in \"./scrm $@ -seed $i\""
-        exit 1
-      fi
-    fi
-
-    # Test for memory leaks
-    if [ $valgrind -ne 0 ]; then
-      valgrind --error-exitcode=1 --leak-check=full -q ./scrm $@ -seed $i > /dev/null
-      if [ $? -ne 0 ]; then
-        echo ""
-        echo "Valgrind check of \"./scrm $@ -seed $i\" failed."
-        exit 1
-      fi
-    fi
-
   done
   echo " done."
 }
@@ -132,12 +101,3 @@ echo "Various Edge Cases"
  test_scrm 10 1 -es 1.0 1 0.5 -ej 1.0 2 1 || exit 1
  test_scrm 4 1 -t 1.0 -I 2 2 0 -ej 1.0 1 2 -eI 3.5 0 2 || exit 1
 echo ""
-
-# Generate html report
-lcov --base-directory . --directory . --zerocounters -q
-make check -mj
-lcov --base-directory . --directory . -c -o libbash_test.info
-# --rc lcov_branch_coverage=1 option will turn on branch check
-lcov --remove libbash_test.info "/usr*" -o libbash_test.info # remove output for external libraries
-rm -rf ./testCoverage
-genhtml -o ./testCoverage -t "libbash test coverage" --num-spaces 4 libbash_test.info --legend --function-coverage --demangle-cpp



View it on GitLab: https://salsa.debian.org/med-team/scrm/-/compare/3bc8ed56a2b78bc9db8a92b470c88f7a1382d6de...3d3afebea445abc1caca5413eeb3228492ac0306

-- 
View it on GitLab: https://salsa.debian.org/med-team/scrm/-/compare/3bc8ed56a2b78bc9db8a92b470c88f7a1382d6de...3d3afebea445abc1caca5413eeb3228492ac0306
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/20201202/57e04cfd/attachment-0001.html>