Merge branch 'master' into buildsystems

[debhelper.git] / dh_auto_test

diff --git a/dh_auto_test b/dh_auto_test
index a9be1e6a6e805dfe5227e6135a07e23310a5a1fa..e68bf09a043f745c26acab66e1f4d5876097d3a0 100755 (executable)
--- a/dh_auto_test
+++ b/dh_auto_test
@@ -7,7 +7,7 @@ dh_auto_test - automatically runs a package's test suites
 =cut
 
 use strict;
-use Debian::Debhelper::Dh_Lib;
+use Debian::Debhelper::Dh_Buildsystems;
 
 =head1 SYNOPSIS
 
@@ -23,7 +23,7 @@ exit nonzero. If there's no test suite, it will exit zero without doing
 anything.
 
 This is intended to work for about 90% of packages with a test suite. If it
-doesn't work, you're encoruaged to skip using dh_auto_test at all, and
+doesn't work, you're encouraged to skip using dh_auto_test at all, and
 just run the test suite manually.
 
 =head1 OPTIONS
@@ -32,32 +32,25 @@ just run the test suite manually.
 
 =item B<--> I<params>
 
-Pass "params" to the program that is run. These can be used to suppliment
+Pass "params" to the program that is run. These can be used to supplement
 or override the any standard parameters that dh_auto_test passes.
 
 =back
 
+=head1 NOTES
+
+If the DEB_BUILD_OPTIONS environment variable contains "nocheck", no
+tests will be performed.
+
 =cut
 
-init();
-
-if (-e "Makefile" || -e "makefile" || -e "GNUmakefile") {
-       $ENV{MAKE}="make" unless exists $ENV{MAKE};
-       foreach my $target (qw{test check}) {
-               # Use make -n to check to see if the target would do
-               # anything. There's no good way to test if a target exists.
-               my $ret=`$ENV{MAKE} -s -n $target 2>/dev/null`;
-               chomp $ret;
-               if (length $ret) {
-                       doit($ENV{MAKE}, $target, @{$dh{U_PARAMS}});
-                       last;
-               }
-       }
-}
-elsif (-e "Build.PL" && -e "Build") {
-       doit(qw/perl Build test/, @{$dh{U_PARAMS}});
+if (defined $ENV{DEB_BUILD_OPTIONS} && $ENV{DEB_BUILD_OPTIONS} =~ /nocheck/) {
+       exit 0;
 }
 
+buildsystems_init();
+buildsystems_do();
+
 =head1 SEE ALSO
 
 L<debhelper(7)>