aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-16 22:09:58 +0100
committerAndreas Guldstrand <andreas.guldstrand@gmail.com>2015-12-16 22:09:58 +0100
commit17c4a32303616d0a4e49f898d88ad286783599ea (patch)
treef3fef92154e5e16451296e9fee8160b3b4d95bd7
parente0272499c0432e5cdadcd2bcae6349c970225908 (diff)
downloadsbotools2-17c4a32303616d0a4e49f898d88ad286783599ea.tar.xz
Fix up travis.t
-rwxr-xr-xt/travis.t7
1 files changed, 5 insertions, 2 deletions
diff --git a/t/travis.t b/t/travis.t
index e2a1dbe..df44cf8 100755
--- a/t/travis.t
+++ b/t/travis.t
@@ -31,10 +31,10 @@ sub run {
my ($output, $return) = capture_merged {
my $ret;
if (defined(my $input = $args{input})) {
- $ret = system(qw/bash -c/, "$^X -I$lib $path/$cmd @args <<END\n$input\nEND\n") and $? >> 8;
+ $ret = system(qw/bash -c/, "$^X -I$lib $path/$cmd @args <<END\n$input\nEND\n") && $? >> 8;
}
else {
- $ret = system(@cmd) and $? >> 8;
+ $ret = system(@cmd) && $? >> 8;
}
$ret;
};
@@ -132,4 +132,7 @@ capture_merged {
system(qw!/sbin/removepkg nonexistentslackbuild!);
system(qw!/sbin/removepkg nonexistentslackbuild4!);
system(qw!/sbin/removepkg nonexistentslackbuild5!);
+ unlink "$RealBin/LO/nonexistentslackbuild/perf.dummy";
+ unlink "$RealBin/LO/nonexistentslackbuild4/perf.dummy";
+ unlink "$RealBin/LO/nonexistentslackbuild5/perf.dummy";
};