Merge pull request #1654 from Deiz/complete-run-chdir

Allow complete-run.pl to be run from any directory
This commit is contained in:
Michael Stapelberg 2015-04-12 10:46:54 -07:00
commit 4958ca00ab
1 changed files with 15 additions and 2 deletions

View File

@ -8,7 +8,6 @@ use v5.10;
use utf8; use utf8;
# the following are modules which ship with Perl (>= 5.10): # the following are modules which ship with Perl (>= 5.10):
use Pod::Usage; use Pod::Usage;
use Cwd qw(abs_path);
use File::Temp qw(tempfile tempdir); use File::Temp qw(tempfile tempdir);
use Getopt::Long; use Getopt::Long;
use POSIX (); use POSIX ();
@ -17,8 +16,20 @@ use TAP::Parser;
use TAP::Parser::Aggregator; use TAP::Parser::Aggregator;
use Time::HiRes qw(time); use Time::HiRes qw(time);
use IO::Handle; use IO::Handle;
my $dirname;
BEGIN {
use File::Basename;
use Cwd qw(abs_path);
# fileparse()[1] contains the directory portion of the specified path.
# See File::Basename(3p) for more details.
$dirname = (fileparse(abs_path($0)))[1];
}
# these are shipped with the testsuite # these are shipped with the testsuite
use lib qw(lib); use lib $dirname . 'lib';
use StartXServer; use StartXServer;
use StatusLine; use StatusLine;
use TestWorker; use TestWorker;
@ -70,6 +81,8 @@ my $result = GetOptions(
pod2usage(-verbose => 2, -exitcode => 0) if $help; pod2usage(-verbose => 2, -exitcode => 0) if $help;
chdir $dirname or die "Could not chdir into $dirname";
# Check for missing executables # Check for missing executables
my @binaries = qw( my @binaries = qw(
../i3 ../i3