[OSSTEST] adhoc-revtuple-generator: Bisect over 5000 commits (really)

Commit Message

Ian Jackson Nov. 4, 2019, 4:57 p.m. UTC

In e9b0653875b3 we changed one of the `1000' values to `5000'.  But
this magic number had been duplicated.  Urgh!

The result is that adhoc-revtuple-generator might generate a weirdly
truncated output which causes cs-bisection-stop to fail with messages
like this:
  *** not RelvUp at 3d40147282670d597b336be5599b5cc4c2ff7ddd  at ./cs-bisection-step line 554.
  *** not RelvDown at 2fa3479cfadb0bb3fe694dbfd29f2350eb2570df  at ./cs-bisection-step line 554.
  *** not RelvUp at 2fa3479cfadb0bb3fe694dbfd29f2350eb2570df  at ./cs-bisection-step line 554.
  ...
  Use of uninitialized value in concatenation (.) or string at ./cs-bisection-step line 747.
  Should test .
  BROKEN see earlier errors. at ./cs-bisection-step line 1454, <SVGI> line 10089.

Fix this by (i) plumbing the magic value we already edited properly
back to the (command-line controlled) global variable (ii) changing
the global variable from 1000 to 5000.

git-grep '\b1000\b'  still produces a fair amount of output but most
of it is timeouts, which is fair enough.  There is also a flight
count limit in sg-report-flight, which limits how far back it is
willing to look.  We don't want to change that here.

With this change, cs-bisection-step on the currently-failing freebsd
build job does this:
  Searching for interesting versions
  Result found: flight 141420 (pass), for basis pass
  Result found: flight 143397 (fail), for basis failure
  Need to reproduce basis pass (pass); had 1 already.
  Should test 2fa3479cfadb0bb3fe694dbfd29f2350eb2570df.

This looks plausible: it is picking up where it left off before the
basis pass fell over its horizon.

CC: Roger Pau Monné <[e-mail]>
CC: Jürgen Groß <[e-mail]>
Signed-off-by: Ian Jackson <[e-mail]>
---
 adhoc-revtuple-generator | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/adhoc-revtuple-generator b/adhoc-revtuple-generator
index ac0f2463..c8d6f4ad 100755
--- a/adhoc-revtuple-generator
+++ b/adhoc-revtuple-generator
@@ -28,7 +28,7 @@  use Osstest;
 use Osstest::TestSupport;
 use Osstest::Executive;
 
-our $num= 1000;
+our $num= 5000;
 our $doupdate= 1;
 our $showrev= 0;
 
@@ -553,7 +553,7 @@  sub main () {
     my @trees_continuous;
     foreach my $tree (@trees) {
         my $gen= tree_get_gen($tree);
-        my $count= 5000;
+        my $count= $num;
         my $found= 0;
         my $top= undef;
         while ($count-- > 0) {