Changeset 1044

Show
Ignore:
Timestamp:
07/24/06 11:43:08 (6 years ago)
Author:
ilmari
Message:

r8472@vesla: ilmari | 2006-07-23 22:05:27 +0100
Remove 'use lib' from munin-run and pass PERLLIB via -I instead

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • people/ilmari/modularisation-branch/Makefile

    r1043 r1044  
    270270        @for test in t/*.t; do \ 
    271271                echo -n "$$test: "; \ 
    272                 PERL5LIB=$(PERLLIB) $(PERL) $$test;\ 
     272                PERLLIB=$(PERLLIB) $(PERL) $$test;\ 
    273273        done 
    274274endif 

  • people/ilmari/modularisation-branch/node/munin-run.in

    r1043 r1044  
    2121# 
    2222 
    23 use lib qw(@@PERLLIB@@); 
    2423use strict; 
    2524use Getopt::Long; 

  • people/ilmari/modularisation-branch/t/munin-run.t

    r1042 r1044  
    66 
    77my $PREFIX = $ENV{PWD}.'/t/install'; 
    8 my $run    = "$PREFIX/sbin/munin-run --sconfdir=$ENV{PWD}/t/plugin-conf.d"; 
     8# -T and -I are needed to get PERLLIB through to munin-run since it runs 
     9# with taint checks. $^X is the currently-running perl 
     10my $run = "$^X -T -I$ENV{PERLLIB} $PREFIX/sbin/munin-run --sconfdir=$ENV{PWD}/t/plugin-conf.d"; 
    911 
    1012sub run {