[Koha-patches] [PATCH] bug 2628: fixing test script to deal with DESTDIR in Makefile.PL

Andrew Moore andrew.moore at liblime.com
Fri Sep 19 17:42:54 CEST 2008


Recently, there were changes to the Makefile.PL to make it install in a
DESTDIR that the OS (debian) may choose. This broke the test suite.
Since we're not installing the stuff in the t/ directory, we need to
ignore the DESTDIR specifiation before we write the test-config.txt.
So, this patch adds a call to the _strip_destdir function for all
directories written to the t/test-config.txt file.
---
 Makefile.PL |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile.PL b/Makefile.PL
index 02fd055..381a1c2 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1587,7 +1587,7 @@ sub postamble {
 
             # these directories will be relocated to the 't' directory
             foreach my $dirname ( keys %$target_directories ) {
-                my $dir = $target_directories->{$dirname};
+                my $dir = main::_strip_destdir( $target_directories->{$dirname} );
                 if ( exists $test_suite_override_dirs{$dirname} ) {
                     $dir = main::get_test_dir($dirname);
                 }
-- 
1.5.6




More information about the Koha-patches mailing list