diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/basewiki_brokenlinks.t | 5 | ||||
| -rwxr-xr-x | t/comments.t | 5 | ||||
| -rwxr-xr-x | t/conflicts.t | 5 | ||||
| -rwxr-xr-x | t/img.t | 5 | ||||
| -rwxr-xr-x | t/inline.t | 5 | ||||
| -rwxr-xr-x | t/meta.t | 5 | ||||
| -rwxr-xr-x | t/permalink.t | 5 | ||||
| -rwxr-xr-x | t/podcast.t | 4 | ||||
| -rwxr-xr-x | t/relativity.t | 4 | ||||
| -rwxr-xr-x | t/trail.t | 5 | ||||
| -rwxr-xr-x | t/wrapper-environ.t | 5 |
11 files changed, 31 insertions, 22 deletions
diff --git a/t/basewiki_brokenlinks.t b/t/basewiki_brokenlinks.t index 26e3859ab..f639d0dd8 100755 --- a/t/basewiki_brokenlinks.t +++ b/t/basewiki_brokenlinks.t @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; my $installed = $ENV{INSTALLED_TESTS}; @@ -14,10 +15,10 @@ if ($installed) { else { ok(! system("make -s ikiwiki.out")); ok(! system("make underlay_install DESTDIR=`pwd`/t/tmp/install PREFIX=/usr >/dev/null")); - @command = qw(env LC_ALL=C perl -I. ./ikiwiki.out + @command = (qw(env LC_ALL=C perl), "-I".getcwd, qw(./ikiwiki.out --underlaydir=t/tmp/install/usr/share/ikiwiki/basewiki --set underlaydirbase=t/tmp/install/usr/share/ikiwiki - --templatedir=templates); + --templatedir=templates)); } foreach my $plugin ("", "listdirectives") { diff --git a/t/comments.t b/t/comments.t index a5add9701..f2e32c46e 100755 --- a/t/comments.t +++ b/t/comments.t @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; use IkiWiki; @@ -17,10 +18,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } my $comment; diff --git a/t/conflicts.t b/t/conflicts.t index 07c392cd3..2c2761efb 100755 --- a/t/conflicts.t +++ b/t/conflicts.t @@ -2,6 +2,7 @@ # Tests for bugs relating to conflicting files in the srcdir use warnings; use strict; +use Cwd qw(getcwd); use Test::More tests => 106; my $installed = $ENV{INSTALLED_TESTS}; @@ -13,10 +14,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } # setup @@ -13,6 +13,7 @@ package IkiWiki; use warnings; use strict; +use Cwd qw(getcwd); use Test::More; plan(skip_all => "Image::Magick not available") unless eval q{use Image::Magick; 1}; @@ -27,10 +28,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } push @command, qw(--set usedirs=0 --plugin img t/tmp/in t/tmp/out --verbose); diff --git a/t/inline.t b/t/inline.t index 8c0f1c35a..3a4450365 100755 --- a/t/inline.t +++ b/t/inline.t @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; use IkiWiki; @@ -12,10 +13,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } push @command, qw(--set usedirs=0 --plugin inline @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; use IkiWiki; @@ -16,10 +17,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } push @command, qw(--plugin meta --disable-plugin htmlscrubber); diff --git a/t/permalink.t b/t/permalink.t index edb05a81b..2eb557e1d 100755 --- a/t/permalink.t +++ b/t/permalink.t @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; my $installed = $ENV{INSTALLED_TESTS}; @@ -11,10 +12,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } ok(! system("rm -rf t/tmp")); diff --git a/t/podcast.t b/t/podcast.t index c698d1835..708ac7640 100755 --- a/t/podcast.t +++ b/t/podcast.t @@ -25,10 +25,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @base_command = qw(perl -I. ./ikiwiki.out + @base_command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } my $tmp = 't/tmp'; diff --git a/t/relativity.t b/t/relativity.t index c67c8ba17..7e382eaa7 100755 --- a/t/relativity.t +++ b/t/relativity.t @@ -24,10 +24,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } sub parse_cgi_content { @@ -1,6 +1,7 @@ #!/usr/bin/perl use warnings; use strict; +use Cwd qw(getcwd); use Test::More; use IkiWiki; @@ -35,10 +36,10 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(perl -I. ./ikiwiki.out + @command = ("perl", "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } push @command, qw(--set usedirs=0 --plugin trail --plugin inline diff --git a/t/wrapper-environ.t b/t/wrapper-environ.t index ddf5a6e44..d6d34b9d9 100755 --- a/t/wrapper-environ.t +++ b/t/wrapper-environ.t @@ -22,10 +22,11 @@ if ($installed) { } else { ok(! system("make -s ikiwiki.out")); - @command = qw(env PERL5LIB=t/tmp:blib/lib:blib/arch perl -I. ./ikiwiki.out + @command = (qw(env PERL5LIB=t/tmp:blib/lib:blib/arch perl), + "-I".getcwd, qw(./ikiwiki.out --underlaydir=underlays/basewiki --set underlaydirbase=underlays - --templatedir=templates); + --templatedir=templates)); } writefile("test.setup", "t/tmp", <<EOF |