test: Remove sequence number prefixes from test case filenames

This stops the madness of having to invent sequence numbers to be able
to order the test suite run. Instead we now honour the order of the
arguments passed to the runner.

Makefile.am

@@ -130,12 +130,12 @@ coverage-clean:
 endif
 
 test_cases = \
-	test/000_pod.t \
-	test/100_critic.t \
+	test/pod.t \
+	test/critic.t \
 	$(nil)
 
 test_data = \
-	test/100_critic/perlcriticrc \
+	test/critic/perlcriticrc \
 	$(nil)
 
 include $(top_srcdir)/check.am

debian/changelog

@@ -16,6 +16,7 @@ dpkg (1.17.7) UNRELEASED; urgency=low
   * Perl test suite cleanup:
     - Switch test suite runner from ExtUtils::Command::MM to Test::Harness.
     - Enable colors in test suite runner.
+    - Remove sequence number prefixes from test case filenames.
 
   [ Updated dpkg translations ]
   * German (Sven Joachim).

scripts/Makefile.am

@@ -185,99 +185,99 @@ TEST_COVERAGE = $(PERL_COVERAGE)
 test_tmpdir = t.tmp
 
 test_cases = \
-	t/100_Dpkg_Version.t \
-	t/110_Dpkg_Arch.t \
-	t/150_Dpkg_Package.t \
-	t/190_Dpkg_Shlibs_Cppfilt.t \
-	t/200_Dpkg_Shlibs.t \
-	t/300_Dpkg_BuildOptions.t \
-	t/400_Dpkg_Deps.t \
-	t/500_Dpkg_Path.t \
-	t/550_Dpkg_Util.t \
-	t/600_Dpkg_Changelog.t \
-	t/600_Dpkg_Changelog_Ubuntu.t \
-	t/700_Dpkg_Control.t \
-	t/750_Dpkg_Substvars.t \
-	t/800_Dpkg_IPC.t \
-	t/850_Dpkg_Compression.t \
-	t/910_merge_changelogs.t
+	t/Dpkg_Version.t \
+	t/Dpkg_Arch.t \
+	t/Dpkg_Package.t \
+	t/Dpkg_Shlibs_Cppfilt.t \
+	t/Dpkg_Shlibs.t \
+	t/Dpkg_BuildOptions.t \
+	t/Dpkg_Deps.t \
+	t/Dpkg_Path.t \
+	t/Dpkg_Util.t \
+	t/Dpkg_Changelog.t \
+	t/Dpkg_Changelog_Ubuntu.t \
+	t/Dpkg_Control.t \
+	t/Dpkg_Substvars.t \
+	t/Dpkg_IPC.t \
+	t/Dpkg_Compression.t \
+	t/merge_changelogs.t
 
 test_data = \
-	t/200_Dpkg_Shlibs/symbols.blacklisted \
-	t/200_Dpkg_Shlibs/symbols.blacklist-groups \
-	t/200_Dpkg_Shlibs/symbols.blacklist-filter \
-	t/200_Dpkg_Shlibs/symbols.blacklist-ignore \
-	t/200_Dpkg_Shlibs/symbols.fake-1 \
-	t/200_Dpkg_Shlibs/symbols.fake-2 \
-	t/200_Dpkg_Shlibs/symbols.fake-3 \
-	t/200_Dpkg_Shlibs/symbols.include-1 \
-	t/200_Dpkg_Shlibs/symbols.include-2 \
-	t/200_Dpkg_Shlibs/symbols.include-3 \
-	t/200_Dpkg_Shlibs/basictags.symbols \
-	t/200_Dpkg_Shlibs/basictags.c \
-	t/200_Dpkg_Shlibs/patterns.symbols \
-	t/200_Dpkg_Shlibs/patterns.cpp \
-	t/200_Dpkg_Shlibs/patterns.map \
-	t/200_Dpkg_Shlibs/ld.so.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf_2 \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
-	t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
-	t/200_Dpkg_Shlibs/objdump.space \
-	t/200_Dpkg_Shlibs/objdump.basictags-amd64 \
-	t/200_Dpkg_Shlibs/objdump.basictags-i386 \
-	t/200_Dpkg_Shlibs/objdump.blacklisted \
-	t/200_Dpkg_Shlibs/objdump.patterns \
-	t/200_Dpkg_Shlibs/objdump.glib-ia64 \
-	t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
-	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
-	t/200_Dpkg_Shlibs/objdump.dbd-pg \
-	t/200_Dpkg_Shlibs/objdump.ls \
-	t/600_Dpkg_Changelog/countme \
-	t/600_Dpkg_Changelog/fields \
-	t/600_Dpkg_Changelog/misplaced-tz \
-	t/600_Dpkg_Changelog/regressions \
-	t/600_Dpkg_Changelog/shadow \
-	t/700_Dpkg_Control/control-1 \
-	t/700_Dpkg_Control/bogus-unsigned.dsc \
-	t/700_Dpkg_Control/bogus-armor-double.dsc \
-	t/700_Dpkg_Control/bogus-armor-no-sig.dsc \
-	t/700_Dpkg_Control/bogus-armor-trail.dsc \
-	t/700_Dpkg_Control/bogus-armor-inline.dsc \
-	t/700_Dpkg_Control/bogus-armor-nested.dsc \
-	t/700_Dpkg_Control/bogus-armor-spaces.dsc \
-	t/750_Dpkg_Substvars/substvars1 \
-	t/910_merge_changelogs/ch-old \
-	t/910_merge_changelogs/ch-a \
-	t/910_merge_changelogs/ch-b \
-	t/910_merge_changelogs/ch-badver-a \
-	t/910_merge_changelogs/ch-badver-b \
-	t/910_merge_changelogs/ch-badver-merged \
-	t/910_merge_changelogs/ch-badver-old \
-	t/910_merge_changelogs/ch-merged \
-	t/910_merge_changelogs/ch-merged-basic \
-	t/910_merge_changelogs/ch-merged-pr \
-	t/910_merge_changelogs/ch-merged-pr-basic \
+	t/Dpkg_Shlibs/symbols.blacklisted \
+	t/Dpkg_Shlibs/symbols.blacklist-groups \
+	t/Dpkg_Shlibs/symbols.blacklist-filter \
+	t/Dpkg_Shlibs/symbols.blacklist-ignore \
+	t/Dpkg_Shlibs/symbols.fake-1 \
+	t/Dpkg_Shlibs/symbols.fake-2 \
+	t/Dpkg_Shlibs/symbols.fake-3 \
+	t/Dpkg_Shlibs/symbols.include-1 \
+	t/Dpkg_Shlibs/symbols.include-2 \
+	t/Dpkg_Shlibs/symbols.include-3 \
+	t/Dpkg_Shlibs/basictags.symbols \
+	t/Dpkg_Shlibs/basictags.c \
+	t/Dpkg_Shlibs/patterns.symbols \
+	t/Dpkg_Shlibs/patterns.cpp \
+	t/Dpkg_Shlibs/patterns.map \
+	t/Dpkg_Shlibs/ld.so.conf \
+	t/Dpkg_Shlibs/ld.so.conf_2 \
+	t/Dpkg_Shlibs/ld.so.conf.d/normal.conf \
+	t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
+	t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
+	t/Dpkg_Shlibs/objdump.space \
+	t/Dpkg_Shlibs/objdump.basictags-amd64 \
+	t/Dpkg_Shlibs/objdump.basictags-i386 \
+	t/Dpkg_Shlibs/objdump.blacklisted \
+	t/Dpkg_Shlibs/objdump.patterns \
+	t/Dpkg_Shlibs/objdump.glib-ia64 \
+	t/Dpkg_Shlibs/objdump.libc6-2.3 \
+	t/Dpkg_Shlibs/objdump.libc6-2.6 \
+	t/Dpkg_Shlibs/objdump.dbd-pg \
+	t/Dpkg_Shlibs/objdump.ls \
+	t/Dpkg_Changelog/countme \
+	t/Dpkg_Changelog/fields \
+	t/Dpkg_Changelog/misplaced-tz \
+	t/Dpkg_Changelog/regressions \
+	t/Dpkg_Changelog/shadow \
+	t/Dpkg_Control/control-1 \
+	t/Dpkg_Control/bogus-unsigned.dsc \
+	t/Dpkg_Control/bogus-armor-double.dsc \
+	t/Dpkg_Control/bogus-armor-no-sig.dsc \
+	t/Dpkg_Control/bogus-armor-trail.dsc \
+	t/Dpkg_Control/bogus-armor-inline.dsc \
+	t/Dpkg_Control/bogus-armor-nested.dsc \
+	t/Dpkg_Control/bogus-armor-spaces.dsc \
+	t/Dpkg_Substvars/substvars1 \
+	t/merge_changelogs/ch-old \
+	t/merge_changelogs/ch-a \
+	t/merge_changelogs/ch-b \
+	t/merge_changelogs/ch-badver-a \
+	t/merge_changelogs/ch-badver-b \
+	t/merge_changelogs/ch-badver-merged \
+	t/merge_changelogs/ch-badver-old \
+	t/merge_changelogs/ch-merged \
+	t/merge_changelogs/ch-merged-basic \
+	t/merge_changelogs/ch-merged-pr \
+	t/merge_changelogs/ch-merged-pr-basic \
 	t/origins/debian \
 	t/origins/default \
 	t/origins/ubuntu
 
 test_data_objects = \
-	t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so \
-	t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so \
-	t/200_Dpkg_Shlibs/libobjdump.patterns.so
+	t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
+	t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
+	t/Dpkg_Shlibs/libobjdump.patterns.so
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/200_Dpkg_Shlibs/basictags.c
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -DAMD64 -o $@
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so: $(srcdir)/t/200_Dpkg_Shlibs/basictags.c
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-i386.so: $(srcdir)/t/Dpkg_Shlibs/basictags.c
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libbasictags.so.1 $< \
 	  -o $@
 
-$(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/200_Dpkg_Shlibs/patterns.cpp $(srcdir)/t/200_Dpkg_Shlibs/patterns.map
+$(srcdir)/t/Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/Dpkg_Shlibs/patterns.cpp $(srcdir)/t/Dpkg_Shlibs/patterns.map
 	$(CXX) $(CXXFLAGS) -shared -fPIC -Wl,-soname -Wl,libpatterns.so.1 \
-	    -Wl,--version-script=$(srcdir)/t/200_Dpkg_Shlibs/patterns.map $< \
+	    -Wl,--version-script=$(srcdir)/t/Dpkg_Shlibs/patterns.map $< \
 	    -o $@
 
 .PHONY: refresh-test-data
@@ -285,13 +285,13 @@ $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so: $(srcdir)/t/200_Dpkg_Shlibs/
 OBJDUMP = objdump -w -f -p -T -R
 
 refresh-test-data: $(test_data_objects)
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.basictags-amd64
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.basictags-i386
-	$(OBJDUMP) $(srcdir)/t/200_Dpkg_Shlibs/libobjdump.patterns.so \
-	  >$(srcdir)/t/200_Dpkg_Shlibs/objdump.patterns
-	$(OBJDUMP) `which ls` >$(srcdir)/t/200_Dpkg_Shlibs/objdump.ls
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-amd64.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.basictags-amd64
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.basictags-i386.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.basictags-i386
+	$(OBJDUMP) $(srcdir)/t/Dpkg_Shlibs/libobjdump.patterns.so \
+	  >$(srcdir)/t/Dpkg_Shlibs/objdump.patterns
+	$(OBJDUMP) `which ls` >$(srcdir)/t/Dpkg_Shlibs/objdump.ls
 
 include $(top_srcdir)/check.am
 

scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf

@@ -1 +0,0 @@
-include t/200_Dpkg_Shlibs/ld.so.conf

scripts/t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf

@@ -1 +0,0 @@
-include t/200_Dpkg_Shlibs/ld.so.conf_2

scripts/t/600_Dpkg_Changelog.t

@@ -28,7 +28,7 @@ BEGIN {
 };
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/600_Dpkg_Changelog';
+my $datadir = $srcdir . '/t/Dpkg_Changelog';
 
 my $vendor = get_current_vendor();
 

scripts/t/600_Dpkg_Changelog_Ubuntu.t

@@ -18,4 +18,4 @@ use warnings;
 
 $ENV{DEB_VENDOR} = 'Ubuntu';
 my $srcdir = $ENV{srcdir} || '.';
-do "$srcdir/t/600_Dpkg_Changelog.t";
+do "$srcdir/t/Dpkg_Changelog.t";

scripts/t/850_Dpkg_Compression.t

@@ -21,7 +21,7 @@ use Test::More tests => 13;
 use_ok('Dpkg::Compression');
 use_ok('Dpkg::Compression::FileHandle');
 
-my $tmpdir = 't.tmp/850_Dpkg_Compression';
+my $tmpdir = 't.tmp/Dpkg_Compression';
 mkdir $tmpdir;
 my @lines = ("One\n", "Two\n", "Three\n");
 my $fh;

scripts/t/700_Dpkg_Control.t

@@ -25,7 +25,7 @@ BEGIN {
 }
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/700_Dpkg_Control';
+my $datadir = $srcdir . '/t/Dpkg_Control';
 
 sub parse_dsc {
     my ($path) = @_;

scripts/t/500_Dpkg_Path.t

@@ -22,7 +22,7 @@ use_ok('Dpkg::Path', 'canonpath', 'resolve_symlink',
        'check_files_are_the_same', 'get_pkg_root_dir',
        'guess_pkg_root_dir', 'relative_to_pkg_root');
 
-my $tmpdir = 't.tmp/500_Dpkg_Path';
+my $tmpdir = 't.tmp/Dpkg_Path';
 
 mkdir $tmpdir;
 mkdir "$tmpdir/a";

scripts/t/200_Dpkg_Shlibs.t

@@ -30,14 +30,14 @@ my @save_paths = Dpkg::Shlibs::get_library_paths();
 Dpkg::Shlibs::reset_library_paths();
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/200_Dpkg_Shlibs';
+my $datadir = $srcdir . '/t/Dpkg_Shlibs';
 
 # We want relative paths inside the ld.so.conf fragments to work, and $srcdir
 # is usually a relative path, so let's temporarily switch directory.
 # XXX: An alternative would be to make parse_ldso_conf relative path aware.
 my $cwd = cwd();
 chdir($srcdir);
-Dpkg::Shlibs::parse_ldso_conf('t/200_Dpkg_Shlibs/ld.so.conf');
+Dpkg::Shlibs::parse_ldso_conf('t/Dpkg_Shlibs/ld.so.conf');
 chdir($cwd);
 
 use Data::Dumper;

scripts/t/200_Dpkg_Shlibs/ld.so.conf

@@ -5,5 +5,5 @@
 /nonexistant/lib64
 
 include /nonexistant/*.conf
-include t/200_Dpkg_Shlibs/ld.so.conf.d/*.conf
+include t/Dpkg_Shlibs/ld.so.conf.d/*.conf
 

scripts/t/Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf

@@ -0,0 +1 @@
+include t/Dpkg_Shlibs/ld.so.conf

scripts/t/Dpkg_Shlibs/ld.so.conf.d/recursive.conf

@@ -0,0 +1 @@
+include t/Dpkg_Shlibs/ld.so.conf_2

scripts/t/200_Dpkg_Shlibs/objdump.basictags-amd64

@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.basictags-amd64.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.basictags-amd64.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00000410

scripts/t/200_Dpkg_Shlibs/objdump.basictags-i386

@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.basictags-i386.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.basictags-i386.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00000440

scripts/t/200_Dpkg_Shlibs/objdump.patterns

@@ -1,5 +1,5 @@
 
-./t/200_Dpkg_Shlibs/libobjdump.patterns.so:     file format elf32-i386
+./t/Dpkg_Shlibs/libobjdump.patterns.so:     file format elf32-i386
 architecture: i386, flags 0x00000150:
 HAS_SYMS, DYNAMIC, D_PAGED
 start address 0x00001880

scripts/t/750_Dpkg_Substvars.t

@@ -24,7 +24,7 @@ use Dpkg::Arch qw(get_host_arch);
 use_ok('Dpkg::Substvars');
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = $srcdir . '/t/750_Dpkg_Substvars';
+my $datadir = $srcdir . '/t/Dpkg_Substvars';
 
 my $s = Dpkg::Substvars->new();
 
@@ -80,7 +80,7 @@ is($s->substvars('This is a string with unknown variable ${blubb}'),
                  'This is a string with unknown variable ',
                  'substvars missing');
 delete $SIG{__WARN__};
-is($output, '750_Dpkg_Substvars.t: warning: unknown substitution variable ${blubb}'."\n"
+is($output, 'Dpkg_Substvars.t: warning: unknown substitution variable ${blubb}'."\n"
           , 'missing variables warning');
 
 # Recursive replace
@@ -99,7 +99,7 @@ $output = '';
 $SIG{__WARN__} = sub { $output .= $_[0] };
 $s->warn_about_unused();
 delete $SIG{__WARN__};
-is($output, "750_Dpkg_Substvars.t: warning: unused substitution variable \${var2}\n",
+is($output, "Dpkg_Substvars.t: warning: unused substitution variable \${var2}\n",
           , 'unused variables warnings');
 
 # Disable warnings for a certain variable

scripts/t/910_merge_changelogs.t

@@ -24,7 +24,7 @@ use File::Compare;
 use File::Temp qw(tempfile);
 
 my $srcdir = $ENV{srcdir} || '.';
-my $datadir = "$srcdir/t/910_merge_changelogs";
+my $datadir = "$srcdir/t/merge_changelogs";
 
 my $res;
 sub test_merge {

src/Makefile.am

@@ -91,7 +91,7 @@ install-data-local:
 test_tmpdir = t.tmp
 
 test_cases = \
-	t/100_dpkg_divert.t
+	t/dpkg_divert.t
 
 include $(top_srcdir)/check.am
 

src/t/100_dpkg_divert.t

@@ -27,7 +27,7 @@ delete $ENV{DPKG_MAINTSCRIPT_ARCH};
 
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
-my $tmpdir = 't.tmp/950_dpkg_divert';
+my $tmpdir = 't.tmp/dpkg_divert';
 my $admindir = File::Spec->rel2abs("$tmpdir/admindir");
 my $testdir = File::Spec->rel2abs("$tmpdir/testdir");
 

test/100_critic.t

@@ -115,7 +115,7 @@ my @policies = qw(
 );
 
 Test::Perl::Critic->import(
-    -profile => 'test/100_critic/perlcriticrc',
+    -profile => 'test/critic/perlcriticrc',
     -verbose => 8,
     -include => \@policies,
     -only => 1,

utils/Makefile.am

@@ -55,7 +55,7 @@ TEST_ENV_VARS = DPKG_DATADIR=$(top_srcdir)
 
 test_tmpdir = t.tmp
 test_cases = \
-	t/100_update_alternatives.t
+	t/update_alternatives.t
 
 include $(top_srcdir)/check.am
 

utils/t/100_update_alternatives.t

@@ -22,7 +22,7 @@ use strict;
 use warnings;
 
 my $srcdir = $ENV{srcdir} || '.';
-my $tmpdir = 't.tmp/900_update_alternatives';
+my $tmpdir = 't.tmp/update_alternatives';
 my $admindir = File::Spec->rel2abs("$tmpdir/admindir"),
 my $altdir = File::Spec->rel2abs("$tmpdir/alternatives");
 my $bindir = File::Spec->rel2abs("$tmpdir/bin");