[med-svn] [bowtie2] 07/09: Drop single-cpu-for-test.patch, as we disabled random-test target completely

[Alex Mestiashvili]

This is an automated email from the git hooks/post-receive script.

malex-guest pushed a commit to branch master
in repository bowtie2.

commit 39e45cd3db7983515645c04e3a95bed1d0e3e7ee
Author: Alexandre Mestiashvili <alex at biotec.tu-dresden.de>
Date:   Fri Oct 13 14:53:08 2017 +0200

    Drop single-cpu-for-test.patch, as we disabled random-test target completely
---
 debian/patches/series                    |  1 -
 debian/patches/single-cpu-for-test.patch | 51 --------------------------------
 2 files changed, 52 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index 9eeec10..b49848a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,3 @@ hardening.patch
 reproducible.patch
 skip_test_requiring_non-free_libmath-random-perl.patch
 do-not-rebuild-during-test.patch
-single-cpu-for-test.patch
diff --git a/debian/patches/single-cpu-for-test.patch b/debian/patches/single-cpu-for-test.patch
deleted file mode 100644
index d4c838a..0000000
--- a/debian/patches/single-cpu-for-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: only use single CPU for testing
- This also frees us of the dependency to the non-packaged libsys-info-perl.
-Author: Sascha Steinbiss <satta at debian.org>
---- bowtie2.orig/Makefile
-+++ bowtie2/Makefile
-@@ -493,7 +493,7 @@
- .PHONY: random-test perl-deps
- random-test: all
- 	eval `perl -I $(CURDIR)/.perllib.tmp/lib/perl5 -Mlocal::lib=$(CURDIR)/.perllib.tmp` ; \
--	sh ./scripts/sim/run.sh $(if $(NUM_CORES), $(NUM_CORES), 2)
-+	sh ./scripts/sim/run.sh 1 #$(if $(NUM_CORES), $(NUM_CORES), 2)
- 
- .PHONY: perl-deps
- perl-deps:
---- bowtie2.orig/scripts/sim/run.sh
-+++ bowtie2/scripts/sim/run.sh
-@@ -19,7 +19,7 @@
- # along with Bowtie 2.  If not, see <http://www.gnu.org/licenses/>.
- #
- 
--CPUS=$1
-+CPUS=1
- shift
- #make -j$CPUS \
- #	bowtie2-align-s \
---- bowtie2.orig/scripts/sim/Sim.pm
-+++ bowtie2/scripts/sim/Sim.pm
-@@ -33,8 +33,8 @@
- use Math::Random;
- use List::Util qw(max min);
- use POSIX;
--use Sys::Info;
--use Sys::Info::Constants qw( :device_cpu );
-+#use Sys::Info;
-+#use Sys::Info::Constants qw( :device_cpu );
- 
- ##
- # Replacement for "die" that additionally writes error message to file so that
-@@ -402,9 +402,9 @@
- 	if($r4 == 0) {
- 		$args{"--offrate"} = int(rand(8))+1;
- 	}
--	my $info = Sys::Info->new;
--	my $cpu = $info->device('CPU');
--	$args{"--threads"} = int(rand($cpu->count || 1)) + 1;
-+#	my $info = Sys::Info->new;
-+#	my $cpu = $info->device('CPU');
-+#	$args{"--threads"} = int(rand($cpu->count || 1)) + 1;
- 	$args{"--large-index"} = "" if $large_index;
- 	return \%args;
- }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/bowtie2.git