]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
duration_estimator: Introduce $duration_duration_qtxt and @d_d_args
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 10 Aug 2016 15:52:53 +0000 (16:52 +0100)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 11 Aug 2016 16:04:04 +0000 (17:04 +0100)
This is going to make it easier to, conditionally, make this query
more complicated.

No functional change.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Osstest/Executive.pm

index 7a35a19dc1cb021d9d6e07e8f47e4e0172fdea12..a57ea5536bb2d5fac999cae40149b8b19e2041fd 100644 (file)
@@ -1056,12 +1056,14 @@ END
 END
     # s J J J # fix perl-mode
 
-    my $duration_duration_q= $dbh_tests->prepare(<<END);
+    my $duration_duration_qtxt= <<END;
             SELECT sum(finished-started) AS duration FROM steps
                          WHERE flight=? AND job=?
                             AND step != 'ts-hosts-allocate'
 END
 
+    my $duration_duration_q = $dbh_tests->prepare($duration_duration_qtxt);
+
     return sub {
         my ($job, $hostidname, $onhost) = @_;
 
@@ -1098,7 +1100,8 @@ END
 
         my $duration_max= 0;
         foreach my $ref (@$refs) {
-            $duration_duration_q->execute($ref->{flight}, $job);
+           my @d_d_args = ($ref->{flight}, $job);
+            $duration_duration_q->execute(@d_d_args);
             my ($duration) = $duration_duration_q->fetchrow_array();
             $duration_duration_q->finish();
             if ($duration) {