@@ -1059,21 +1059,25 @@ sub executive_resource_shared_mark_ready ($$$;$$) {
$newstate //= 'ready';
my $what= "resource $restype $resname";
- $sharetype .= ' '.get_harness_rev();
+ if (defined $sharetype) {
+ $sharetype .= ' '.get_harness_rev();
+ } else {
+ die if $newstate eq 'ready';
+ }
db_retry($dbh_tests, [qw(resources)], sub {
$oldshr= resource_check_allocated_core($restype, $resname);
if (defined $oldshr) {
die "$what shared $oldshr->{Type} not $sharetype"
- unless $oldshr->{Type} eq $sharetype;
+ unless !defined $sharetype or $oldshr->{Type} eq $sharetype;
die "$what shared state $oldshr->{State} not $oldstate"
unless $oldshr->{State} eq $oldstate;
- my $nrows= $dbh_tests->do(<<END,{}, $newstate, $restype,$resname,$sharetype);
+ my $nrows= $dbh_tests->do(<<END,{}, $newstate, $restype,$resname);
UPDATE resource_sharing
SET state=?
- WHERE restype=? AND resname=? AND sharetype=?
+ WHERE restype=? AND resname=?
END
- die "unexpected not updated state $what $sharetype $nrows"
+ die "unexpected not updated state $what $nrows"
unless $nrows==1;
$dbh_tests->do(<<END,{}, $oldshr->{ResType}, $resname);