More verbose rmdir_builddir() and more its tests

Signed-off-by: Modestas Vainius <modestas@vainius.eu>

diff --git a/Debian/Debhelper/Buildsystem.pm b/Debian/Debhelper/Buildsystem.pm
index 494d2298ce73c082577da342b85a1ed50e3a35d8..6eca336f932b9aae77718dda4799c019cd7f7486 100644 (file)
--- a/Debian/Debhelper/Buildsystem.pm
+++ b/Debian/Debhelper/Buildsystem.pm
@@ -338,7 +338,9 @@ sub rmdir_builddir {
                        # empty parent directories until the source directory level.
                        if (not File::Spec->file_name_is_absolute($buildpath)) {
                                while (($peek=pop(@spdir)) && $peek ne '.' && $peek ne '..') {
-                                       last if ! rmdir($this->get_sourcepath(File::Spec->catdir(@spdir, $peek)));
+                                       my $dir = $this->get_sourcepath(File::Spec->catdir(@spdir, $peek));
+                                       verbose_print("rmdir $dir");
+                                       last if ! rmdir($dir);
                                }
                        }
                }

diff --git a/t/buildsystems/buildsystem_tests b/t/buildsystems/buildsystem_tests
index c432d3ecf9cf2bc989fbaaf7f38f2e934a2fe8db..7e9b4bf173c2f8228ad2a2895cb21afcf6e3a6f4 100755 (executable)
--- a/t/buildsystems/buildsystem_tests
+++ b/t/buildsystems/buildsystem_tests
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-use Test::More tests => 230;
+use Test::More tests => 236;
 
 use strict;
 use warnings;
@@ -338,6 +338,36 @@ test_autoselection("cmake",
       test => "makefile", install => "makefile", clean => "makefile" }, %tmp);
 cleandir $tmpdir;
 
+### Test Buildsystem::rmdir_builddir()
+sub do_rmdir_builddir {
+       my $builddir=shift;
+       my $system;
+       $system = $BS_CLASS->new(builddir => $builddir, sourcedir => $tmpdir);
+       $system->mkdir_builddir();
+       $system->rmdir_builddir();
+}
+
+$builddir = "$tmpdir/builddir";
+do_rmdir_builddir($builddir);
+ok ( ! -e $builddir, "testing rmdir_builddir() 1: builddir parent '$builddir' deleted" );
+ok ( -d $tmpdir, "testing rmdir_builddir() 1: sourcedir '$tmpdir' remains" );
+
+$builddir = "$tmpdir/bld";
+do_rmdir_builddir("$builddir/dir");
+ok ( ! -e $builddir, "testing rmdir_builddir() 2: builddir parent '$builddir' deleted" );
+ok ( -d $tmpdir, "testing rmdir_builddir() 2: sourcedir '$tmpdir' remains" );
+
+$builddir = "$tmpdir/bld";
+mkdir "$builddir";
+touch "$builddir/afile";
+mkdir "$builddir/dir";
+touch "$builddir/dir/afile2";
+do_rmdir_builddir("$builddir/dir");
+ok ( ! -e "$builddir/dir", "testing rmdir_builddir() 3: builddir '$builddir/dir' not empty, but deleted" );
+ok ( -d $builddir, "testing rmdir_builddir() 3: builddir parent '$builddir' not empty, remains" );
+
+cleandir $tmpdir;
+
 ### Test buildsystems_init() and commandline/env argument handling
 sub get_load_bs_source {
        my ($system, $step)=@_;
@@ -433,7 +463,7 @@ sub dh_auto_do_autoconf {
 
 dh_auto_do_autoconf('autoconf');
 dh_auto_do_autoconf('autoconf', 'bld/dir', configure_args => [ "--extra-autoconf-configure-arg" ]);
-ok ( ! -e 'autoconf/bld', "autoconf/bld got deleted too" );
+ok ( ! -e 'bld', "bld got deleted too" );
 
 END {
        system("rm", "-rf", $tmpdir);