From a2393770b6c09f7d67a5f06b090019ae0357f034 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 1 Aug 2016 10:33:40 -0700 Subject: elpa.pm: handle disable option in debian/elpa-test --- elpa.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/elpa.pm b/elpa.pm index 888f555..d6e3126 100755 --- a/elpa.pm +++ b/elpa.pm @@ -6,6 +6,7 @@ use strict; use Debian::Debhelper::Dh_Lib; use Dpkg::Version; use Module::Metadata; +use Config::Tiny; insert_after("dh_install", "dh_elpa"); @@ -13,8 +14,14 @@ insert_after("dh_install", "dh_elpa"); my $info = Module::Metadata->new_from_module("Debian::Control"); my $version = Dpkg::Version->new($info->version()); -if ( !defined $ENV{ 'DH_ELPA_TEST_DISABLE' } - && $version >= 0.90 ) { +my $options; +$options = Config::Tiny->read( "debian/elpa-test" ) + if ( -f "debian/elpa-test" ); + +if ( $version >= 0.90 + && !defined $options->{_}->{ "disable" } + && !defined $ENV{ 'DH_ELPA_TEST_DISABLE' } + ) { insert_after("dh_auto_test", "dh_elpa_test"); remove_command("dh_auto_test"); } -- cgit v1.2.3