[med-svn] [Git][med-team/megahit][master] 2 commits: Change test data path to directory where wrapper was invoked

[Shayan Doust]

Shayan Doust pushed to branch master at Debian Med / megahit


Commits:
23d414fc by Shayan Doust at 2019-10-15T05:08:50Z
Change test data path to directory where wrapper was invoked
Todo: Currently the python data file check was removed as this became problematic for me, but re-add to ensure no errornous outcome

- - - - -
0b3b25e8 by Shayan Doust at 2019-10-15T05:10:11Z
Install files into their correct directories

- - - - -


3 changed files:

- + debian/megahit.install
- + debian/patches/fix_test_path.patch
- debian/patches/series


Changes:

=====================================
debian/megahit.install
=====================================
@@ -0,0 +1,5 @@
+obj-x86_64-linux-gnu/megahit usr/bin
+obj-x86_64-linux-gnu/megahit_core usr/bin
+obj-x86_64-linux-gnu/megahit_core_no_hw_accel usr/bin
+obj-x86_64-linux-gnu/megahit_core_popcnt usr/bin
+obj-x86_64-linux-gnu/megahit_toolkit usr/bin


=====================================
debian/patches/fix_test_path.patch
=====================================
@@ -0,0 +1,28 @@
+Description: for sake of autopkgtest, change test data directory
+ This now becomes the working directory.
+Author: Shayan Doust <hello at shayandoust.me>
+Last-Update: 2019-10-15
+---
+
+Index: megahit/src/megahit
+===================================================================
+--- megahit.orig/src/megahit	2019-10-15 06:06:49.207438632 +0100
++++ megahit/src/megahit	2019-10-15 06:06:49.203438593 +0100
+@@ -566,14 +566,9 @@
+ 
+ 
+ def find_test_data_path():
+-    script_path = software_info.script_path
+-    for path in [os.path.join(script_path, '..'), os.path.join(script_path, '../share/megahit')]:
+-        test_data_dir = abspath(os.path.join(path, 'test_data'))
+-        if os.path.isdir(test_data_dir) and all(
+-                f in os.listdir(test_data_dir) for f in ['r1.il.fa.gz', 'r2.il.fa.bz2', 'r3_1.fa', 'r3_2.fa', 'r4.fa']):
+-            return test_data_dir
+-    raise Usage('Test data not found! Script path = {0}'.format(script_path))
+-
++        # The test will suspend anyways if the files are not there
++        test_data_dir = '.'
++        return test_data_dir
+ 
+ def check_reads():
+     if opt.test_mode:


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
+fix_test_path.patch
 2to3.patch
 fix_src_packed_field.patch



View it on GitLab: https://salsa.debian.org/med-team/megahit/compare/9bfa748d42ea907f0ce283dbfdc32b95048f96e5...0b3b25e8b17b1fa87c002a8aa364584e8ba7ccba

-- 
View it on GitLab: https://salsa.debian.org/med-team/megahit/compare/9bfa748d42ea907f0ce283dbfdc32b95048f96e5...0b3b25e8b17b1fa87c002a8aa364584e8ba7ccba
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/20191015/b943f9f3/attachment-0001.html>