[med-svn] r16715 - in trunk/packages/autodocksuite/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2014-04-16 17:16:08 +0000 (Wed, 16 Apr 2014)
New Revision: 16715

Added:
   trunk/packages/autodocksuite/trunk/debian/patches/fix_test_outputdir.patch
Modified:
   trunk/packages/autodocksuite/trunk/debian/changelog
Log:
Upload to unstable


Modified: trunk/packages/autodocksuite/trunk/debian/changelog
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/changelog	2014-04-16 17:08:42 UTC (rev 16714)
+++ trunk/packages/autodocksuite/trunk/debian/changelog	2014-04-16 17:16:08 UTC (rev 16715)
@@ -1,4 +1,4 @@
-autodocksuite (4.2.5.1-5) UNRELEASED; urgency=low
+autodocksuite (4.2.5.1-4) unstable; urgency=low
 
   [ Steffen Moeller ]
   * created list of patches introducing more 'const' - not applied
@@ -15,6 +15,7 @@
      - short dh
      - fixed clean target
      - run testsuite
+    Closes: #733206
 
  -- Andreas Tille <tille at debian.org>  Tue, 15 Apr 2014 18:01:38 +0200
 

Added: trunk/packages/autodocksuite/trunk/debian/patches/fix_test_outputdir.patch
===================================================================
--- trunk/packages/autodocksuite/trunk/debian/patches/fix_test_outputdir.patch	                        (rev 0)
+++ trunk/packages/autodocksuite/trunk/debian/patches/fix_test_outputdir.patch	2014-04-16 17:16:08 UTC (rev 16715)
@@ -0,0 +1,46 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Tue, 15 Apr 2014 18:01:38 +0200
+Description: Make sure the test suite deals properly with its used directories
+
+--- a/autodock/Makefile.am
++++ b/autodock/Makefile.am
+@@ -439,7 +439,8 @@ test : autodock4 $(srcdir)/Tests/test_au
+ 	@echo " "
+ 	@echo "Running the Python test_autodock4.py unit-tests on autodock4"
+ 	@echo " "
+-	outputdir=`pwd` ;\
++	outputdir=$(srcdir)/../autodock_testresults ;\
++	mkdir -p $$outputdir ;\
+ 	umask 0 ;\
+ 	test -d $$outputdir/Tests || mkdir $$outputdir/Tests ;\
+     rm -f $$outputdir/Tests/test_autodock4.py;\
+@@ -449,7 +450,7 @@ test : autodock4 $(srcdir)/Tests/test_au
+     cp $(srcdir)/Tests/*.dpf  $$outputdir/Tests;\
+     cp $(srcdir)/Tests/*.pdbqt  $$outputdir/Tests;\
+     cp $(srcdir)/Tests/*.map*  $$outputdir/Tests;\
+-	cd Tests ;  python ./test_autodock4.py -d . -e ../autodock4$(EXEEXT) -o .
++	cd $$outputdir/Tests ;  python ./test_autodock4.py -d . -e ../../autodock/autodock4$(EXEEXT) -o .
+ #else
+ #	@echo " "
+ #	@echo "Python version 2.1 or higher needed for 'make check', but not found."
+--- a/autogrid/Makefile.am
++++ b/autogrid/Makefile.am
+@@ -130,7 +130,8 @@ test : autogrid4 $(srcdir)/Tests/test_au
+ # for technical reasons, autogrid must be run in the Tests
+ # directory because it writes its maps into its current directory
+ # and expects to find AD4.1_bound.dat in that same directory.
+-	outputdir=`pwd` ;\
++	outputdir=$(srcdir)/../autogrid_testresults ;\
++	mkdir -p $$outputdir ;\
+ 	umask 0 ;\
+ 	test -d $$outputdir/Tests || mkdir $$outputdir/Tests ;\
+ 	chmod a+w $$outputdir/Tests/*;\
+@@ -141,7 +142,7 @@ test : autogrid4 $(srcdir)/Tests/test_au
+ 	cp $(srcdir)/Tests/*.map*  $$outputdir/Tests;\
+ 	chmod a+w $$outputdir/Tests/*;\
+ 	cd $$outputdir/Tests;\
+-	python ./test_autogrid4.py -d . -e ../autogrid4$(EXEEXT) -o .
++	python ./test_autogrid4.py -d . -e ../../autogrid/autogrid4$(EXEEXT) -o .
+ #else
+ #	@echo " "
+ #	@echo "Python version 2.1 or higher needed for 'make test', but not found."