Skip to content

Commit

Permalink
[test] ignore smolder upload failures on make smoke
Browse files Browse the repository at this point in the history
and smolder_fulltest. fixes GH #1040. Travis should now be useful again
  • Loading branch information
Reini Urban committed Mar 5, 2014
1 parent cea93bf commit 42f2c4e
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
7 changes: 6 additions & 1 deletion t/fullharness
Expand Up @@ -78,7 +78,12 @@ if ($archive) {
} );
my $overall_aggregator = $archive->runtests(\@targets);
$archive->summary($overall_aggregator);
send_archive_to_smolder(%env_data) if $smolder;
# smolder is currently (2014) too unstable to accept most reports: GH #1040
# osuosl blames their 32bit VM
eval { send_archive_to_smolder(%env_data); } if $smolder;
warn $@ if $@;
my $exit_value = ($overall_aggregator->get_status() eq 'PASS') ? 0 : 1;
exit($exit_value);
}
else {
require TAP::Formatter::Console;
Expand Down
5 changes: 4 additions & 1 deletion t/harness
Expand Up @@ -85,7 +85,10 @@ if ($longopts->{archive}) {
}
);
my $results = $harness->runtests(@tests);
send_archive_to_smolder(%env_data) if $longopts->{send_to_smolder};
# smolder is currently (2014) too unstable to accept most reports: GH #1040
# osuosl blames their 32bit VM
eval { send_archive_to_smolder(%env_data); } if $longopts->{send_to_smolder};
warn $@ if $@;
exit ( $results->all_passed() ? 0 : 1 );
}
elsif ($longopts->{html}) {
Expand Down

0 comments on commit 42f2c4e

Please sign in to comment.