kdesrc-build-test: Catch exceptions thrown during testing.

wilder
Michael Pyne 15 years ago
parent f3ed9f7fca
commit 5b6712c983
  1. 16
      kdesrc-build-test.pl

@ -11,6 +11,7 @@
use strict;
use warnings;
use 5.010;
use Getopt::Long;
# Control whether we actually try to svn checkouts, possibly more later.
@ -74,6 +75,8 @@ for my $key (keys %more_package_opts) {
$package_opts{$key} = $more_package_opts{$key};
}
eval {
# If using set-env, it is handled by the handle_set_env routine, so the
# value should be the space separated VAR and VALUE.
set_option('global', 'set-env', 'TESTY_MCTEST yes');
@ -337,6 +340,19 @@ ok(! -d "$testSourceDirName/build", 'Ensure build dir does not exist');
isnt(super_mkdir("$testSourceDirName/build"), 0, 'Make temp build directory');
ok(-d "$testSourceDirName/build", 'Double-check temp build dir created');
}; # eval
if (my $err = $@) {
if (ref $err && $err->isa('BuildException')) {
say "Test suite failed after kdesrc-build threw the following exception:";
say "$@->{message}";
fail();
}
else {
die; # Re-throw
}
}
# svn cd'ed on us, switch to a known directory to avoid errors unlinking the
# temporary directory. In an "END" block so this should occur even if we
# exit testing due to failure/exception.

Loading…
Cancel
Save