[omd-commits] OMD Git: omd: perl: fixed cpan tests

git version control git at mathias-kettner.de
Tue Jul 17 13:30:45 CEST 2012


Module:   omd
Branch:   master
Commit:   eb3fdbdf4f6e00317fddb65f32100b9fe6735073
URL:      http://omdistro.org/projects/omd/repository/revisions/eb3fdbdf4f6e00317fddb65f32100b9fe6735073

Author:   Sven Nierlein <sven at consol.de>
Date:     Tue Jul 17 10:57:20 2012 +0200
Commiter: Sven Nierlein <sven at consol.de>
Date:     Tue Jul 17 12:36:04 2012 +0200

perl: fixed cpan tests

---

 packages/perl-modules/Makefile |    2 +-
 t/20-package_perl-modules.t    |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/perl-modules/Makefile b/packages/perl-modules/Makefile
index 4fd13b9..3e1b31b 100644
--- a/packages/perl-modules/Makefile
+++ b/packages/perl-modules/Makefile
@@ -356,7 +356,7 @@ install:
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/perl5 $(DESTDIR)$(OMD_ROOT)/bin
 	rsync -a $(P5TMPDIST)/dest/lib $(DESTDIR)$(OMD_ROOT)/lib/perl5/
 	mkdir -p $(DESTDIR)$(OMD_ROOT)/local/lib/perl5
-	cp bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper
+	install -m 755 bin/cpan.wrapper $(DESTDIR)$(OMD_ROOT)/bin/cpan.wrapper
 
 skel:
 	echo "install  --install_base  ###ROOT###/local/lib/perl5" > $(SKEL)/.modulebuildrc
diff --git a/t/20-package_perl-modules.t b/t/20-package_perl-modules.t
index 292cb8a..e5a11fa 100644
--- a/t/20-package_perl-modules.t
+++ b/t/20-package_perl-modules.t
@@ -21,7 +21,8 @@ my $site    = TestUtils::create_test_site() or TestUtils::bail_out_clean("no fur
 ##################################################
 # execute some checks
 my $tests = [
-  { cmd => "/bin/su - $site -c '/usr/bin/env cpan'", stdin => "yes\n", like => '/cpan\[1\]>/' },
+  { cmd => "/bin/su - $site -c '/usr/bin/env cpan.wrapper'", stdin => "yes\n", like => '/cpan\[1\]>/' },
+  { cmd => "/bin/su - $site -c '/usr/bin/env cpan'",         stdin => "yes\n", like => '/cpan\[1\]>/' },
 ];
 for my $test (@{$tests}) {
     TestUtils::test_command($test);



More information about the omd-commits mailing list