test suite should not need modification to add a new build system

diff --git a/debian/changelog b/debian/changelog
index fda835276526e943fa047abb95b5c68b5ad8aaff..cfa66725a77064b632dec3c1db7a734d723cdba8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-debhelper (7.3.3) UNRELEASED; urgency=low
+debhelper (7.3.3) experimental; urgency=low
 
   * Add ant buildsystem support. Closes: #537021
+  * Merged debhelper 7.2.22.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 14 Jul 2009 16:35:50 -0400
+ -- Joey Hess <joeyh@debian.org>  Tue, 14 Jul 2009 17:16:28 -0400
 
 debhelper (7.3.2) experimental; urgency=low
 

diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests
index 7d383157f4459cc43717f3a51f746921dcf163d3..8f7a275a05ed3372c2b7d20ee7bde538cf84dbcf 100755 (executable)
--- a/t/buildsystems/buildsystem_tests
+++ b/t/buildsystems/buildsystem_tests
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use Test::More tests => 227;
+use Test::More tests => 228;
 
 use strict;
 use warnings;
@@ -19,7 +19,6 @@ use_ok( 'Debian::Debhelper::Dh_Buildsystems' );
 
 my $TOPDIR = "../..";
 my @STEPS = qw(configure build test install clean);
-my @BUILDSYSTEMS = qw(autoconf perl_makemaker makefile python_distutils perl_build cmake);
 my $BS_CLASS = 'Debian::Debhelper::Buildsystem';
 
 my ($bs, @bs, %bs);
@@ -188,7 +187,8 @@ test_buildsystem_paths_api($bs, "builddir=../bld/dir, sourcedir=autoconf", \%tmp
 ### Test if all buildsystems can be loaded
 @bs = load_all_buildsystems([ $INC[0] ]);
 @tmp = map { $_->NAME() } @bs;
-is_deeply( \@tmp, \@BUILDSYSTEMS, "load_all_buildsystems() loads all built-in buildsystems" );
+ok(@Debian::Debhelper::Dh_Buildsystems::BUILDSYSTEMS >= 1, "some build systems are built in" );
+is_deeply( \@tmp, \@Debian::Debhelper::Dh_Buildsystems::BUILDSYSTEMS, "load_all_buildsystems() loads all built-in buildsystems" );
 
 ### Test check_auto_buildable() of each buildsystem
 sub test_check_auto_buildable {