Check for git before using it in tests.

wilder
Michael Pyne 14 years ago
parent 434358b3ce
commit 6ee80150f3
  1. 12
      kdesrc-build-test.pl

@ -98,10 +98,14 @@ $ctx->setOption('#unused', '1');
$ctx->setOption('branch', '4.3');
# Commence testing proper
my @gitStatusOutput = filter_program_output(sub { /On branch/ }, qw/git status/);
is(@gitStatusOutput, 1, 'Correct number of items from filter_program_output');
is(`git status`, join('', filter_program_output(undef, qw/git status/)), 'Ensure filter_program_output works w/ no filter');
is($ctx->getSourceDir(), $ENV{HOME} . "/kdesrc-build-unused", 'Correct tilde-expansion for source-dir');
SKIP: {
skip 'git not installed', 1 unless defined absPathToExecutable('git');
my @gitStatusOutput = filter_program_output(sub { /On branch/ }, qw/git status/);
is(@gitStatusOutput, 1, 'Correct number of items from filter_program_output');
is(`git status`, join('', filter_program_output(undef, qw/git status/)), 'Ensure filter_program_output works w/ no filter');
is($ctx->getSourceDir(), $ENV{HOME} . "/kdesrc-build-unused", 'Correct tilde-expansion for source-dir');
}
# We know tilde-expansion works for source-dir, reset to our temp dir.
$ctx->setOption('source-dir', $testSourceDirName);

Loading…
Cancel
Save