[med-svn] [Git][med-team/cct][master] 2 commits: Fix autopkgtest

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / cct


Commits:
15e3c8b2 by Andreas Tille at 2020-10-25T17:47:37+01:00
Fix autopkgtest

- - - - -
3b43719b by Andreas Tille at 2020-10-25T17:53:52+01:00
Upload to unstable

- - - - -


5 changed files:

- debian/cct-examples.install
- + debian/cct-examples.links
- debian/changelog
- debian/patches/testscripts.patch
- debian/tests/run-unit-test


Changes:

=====================================
debian/cct-examples.install
=====================================
@@ -1,3 +1,3 @@
 sample_projects			usr/share/doc/cct/examples
 debian/tests/run-unit-test	usr/share/doc/cct
-test_projects			usr/share/doc/cct/examples
+test_projects			usr/share/cct/


=====================================
debian/cct-examples.links
=====================================
@@ -0,0 +1,2 @@
+usr/share/cct/test_projects	usr/share/doc/cct/examples/test_projects
+


=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-cct (1:1.0.0-1) UNRELEASED; urgency=medium
+cct (1:1.0.0-1) unstable; urgency=medium
 
   * New upstream version (upstream is now using proper release
     tags - thus we need an epoch)
@@ -6,7 +6,7 @@ cct (1:1.0.0-1) UNRELEASED; urgency=medium
   * Adapt patches
   * Move hidden examples into example package
 
- -- Andreas Tille <tille at debian.org>  Thu, 22 Oct 2020 21:09:31 +0200
+ -- Andreas Tille <tille at debian.org>  Sun, 25 Oct 2020 17:48:06 +0100
 
 cct (20200419+git20201010.2a46beb-1) unstable; urgency=medium
 


=====================================
debian/patches/testscripts.patch
=====================================
@@ -53,7 +53,7 @@ Description: Fix some test scripts regarding paths and robustness regarding down
 +touch "${CCT_OUT}"/cog_db/.complete
 --- a/scripts/process_test_projects.sh
 +++ b/scripts/process_test_projects.sh
-@@ -27,9 +27,10 @@ if [ -z "$CCT_HOME" ]; then
+@@ -27,21 +27,22 @@ if [ -z "$CCT_HOME" ]; then
  fi
  
  "${CCT_HOME}/scripts/build_cog_db.sh"
@@ -66,8 +66,11 @@ Description: Fix some test scripts regarding paths and robustness regarding down
  fi
  
  TEST_PROJECTS=($(find "${CCT_HOME}/test_projects" -mindepth 1 -maxdepth 1 -name 'test_*' -type d))
-@@ -39,9 +40,9 @@ for project in "${TEST_PROJECTS[@]}"; do
-   cp -R "$project" "${CCT_HOME}"/test_output
+ for project in "${TEST_PROJECTS[@]}"; do
+   p=$(basename "$project")
+   echo "Processing project '$p'"
+-  cp -R "$project" "${CCT_HOME}"/test_output
++  cp -R "$project" "${CCT_OUT}"/test_output
    for j in project_settings.conf; do
      echo "Processing project '$p' using configuration '$j'"
 -    command="perl '${CCT_HOME}/scripts/cgview_comparison_tool.pl' -g '"${CCT_HOME}"/conf/global_settings.conf' -p '"${CCT_HOME}"/test_output/$p' -s '"${CCT_HOME}"/test_output/$p/$j' -f '${p}_${j}_'"


=====================================
debian/tests/run-unit-test
=====================================
@@ -8,11 +8,11 @@ if [ "$AUTOPKGTEST_TMP" = "" ] ; then
   trap "rm -rf $AUTOPKGTEST_TMP" 0 INT QUIT ABRT PIPE TERM
 fi
 
-cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
+#cp -a /usr/share/doc/${pkg}/examples/* $AUTOPKGTEST_TMP
 
 cd $AUTOPKGTEST_TMP
 
-gunzip -r *
+#gunzip -r *
 
 export PATH=$PATH:/usr/share/cct/scripts
 CCT_HOME=/usr/share/cct /usr/share/cct/scripts/process_test_projects.sh



View it on GitLab: https://salsa.debian.org/med-team/cct/-/compare/ada4ad4e7e5d1d8726f8faf0cb825997da907b85...3b43719bc1087426148aaa83b6918b7ed0eaa962

-- 
View it on GitLab: https://salsa.debian.org/med-team/cct/-/compare/ada4ad4e7e5d1d8726f8faf0cb825997da907b85...3b43719bc1087426148aaa83b6918b7ed0eaa962
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/20201025/fd77aee2/attachment-0001.html>