We are going to want to default this here in a more sophisticated way,
but we can't do that if it's already been defaulted from $0 earlier.
The other consumer of this default was in JobDB/Standalone, but we
have just changed that to ignore it. So, no functional change.
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
Osstest/JobDB/Executive.pm | 4 ++++
Osstest/TestSupport.pm | 4 ----
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Osstest/JobDB/Executive.pm b/Osstest/JobDB/Executive.pm
index 0d1b3be..fbbb5ac 100644
--- a/Osstest/JobDB/Executive.pm
+++ b/Osstest/JobDB/Executive.pm
@@ -252,6 +252,10 @@ END
INSERT INTO steps (flight,job,stepno, step,status, testid,started)
VALUES (?,?,?, ?,'running', ?,?)
END
+ if (!defined $script) {
+ $script = $0;
+ $script =~ s{^.*/}{};
+ }
my $stepno;
db_retry($flight,[qw(running)], $dbh_tests,[qw(flights)],sub {
$snq->execute($flight,$job);
diff --git a/Osstest/TestSupport.pm b/Osstest/TestSupport.pm
index f10d56e..5a951e5 100644
--- a/Osstest/TestSupport.pm
+++ b/Osstest/TestSupport.pm
@@ -248,10 +248,6 @@ sub complete_testid ($) {
sub substep_start ($;$) {
my ($testid,$script) = @_;
complete_testid(\$testid);
- if (!defined $script) {
- $script = $0;
- $script =~ s{^.*/}{};
- }
$mjobdb->step_start($testid,$script);
}
--
2.1.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
