From 8170f6f03f8f2b432bef943ddc8e18fdce77f785 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 20 May 2020 17:39:32 -0400
Subject: [PATCH] Travis: Fix cron.

---
 .travis.yml          | 54 +++++++++++++++++++++++++++-----------------
 ci/test.sh           | 16 +++++++++----
 nodist/code_coverage |  7 ++++++
 3 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f88621d4..8893fc3e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,7 +39,7 @@ after_script:
   - ccache -s
 
 stages:
-  - "Build Verilator"
+  - vbuild
   - test
 
 jobs:
@@ -52,7 +52,7 @@ jobs:
 #     20.04 coverage       cron
   include:
     - if: type != cron
-      stage: "Build Verilator"
+      stage: vbuild
       name: "Build Verilator"
       dist: focal
       compiler: gcc
@@ -60,25 +60,25 @@ jobs:
 # Non-cron build will just run on whatever linux flavor we get
     - if: type != cron
       stage: test
-      name: "Dist test"
+      name: "Test Dist"
       dist: focal
       compiler: gcc
       script: ci/test.sh dist
     - if: type != cron
       stage: test
-      name: "Vlt test"
+      name: "Test Vlt"
       dist: focal
       compiler: gcc
       script: ci/test.sh vlt
     - if: type != cron
       stage: test
-      name: "Vltmt set 0 test"
+      name: "Test Vltmt set 0"
       dist: focal
       compiler: gcc
       script: ci/test.sh vltmt0
     - if: type != cron
       stage: test
-      name: "Vltmt set 1 test"
+      name: "Test Vltmt set 1"
       dist: focal
       compiler: gcc
       script: ci/test.sh vltmt1
@@ -86,7 +86,7 @@ jobs:
     - if: type = cron
       dist: trusty
       compiler: gcc
-      stage: "Build Verilator"
+      stage: vbuild
       name: "14.04 gcc build"
       script: echo
     - if: type = cron
@@ -105,7 +105,7 @@ jobs:
     - if: type = cron
       dist: xenial
       compiler: gcc
-      stage: "Build Verilator"
+      stage: vbuild
       name: "16.04 gcc build"
       script: echo
     - if: type = cron
@@ -124,7 +124,7 @@ jobs:
     - if: type = cron
       dist: bionic
       compiler: gcc
-      stage: "Build Verilator"
+      stage: vbuild
       name: "18.04 gcc build"
       script: echo
     - if: type = cron
@@ -143,7 +143,7 @@ jobs:
     - if: type = cron
       dist: xenial
       compiler: clang
-      stage: "Build Verilator"
+      stage: vbuild
       name: "16.04 clang build"
       script: echo
     - if: type = cron
@@ -162,7 +162,7 @@ jobs:
     - if: type = cron
       dist: focal
       compiler: clang
-      stage: "Build Verilator"
+      stage: vbuild
       name: "20.04 clang build"
       script: echo
     - if: type = cron
@@ -182,27 +182,39 @@ jobs:
     - if: type = cron
       dist: focal
       compiler: gcc
-      stage: "Coverage Build"
-      name: "Coverage"
+      stage: vbuild
+      name: "Coverage Build"
       script: ci/test.sh coverage-build
     - if: type = cron
       dist: focal
       compiler: gcc
-      stage: "Coverage dist"
-      name: "Coverage"
+      stage: test
+      name: "Coverage dist"
       script: ci/test.sh coverage-dist
     - if: type = cron
       dist: focal
       compiler: gcc
-      stage: "Coverage vlt"
-      name: "Coverage"
-      script: ci/test.sh coverage-vlt
+      stage: test
+      name: "Coverage vlt set 0"
+      script: ci/test.sh coverage-vlt0
     - if: type = cron
       dist: focal
       compiler: gcc
-      stage: "Coverage vltmt"
-      name: "Coverage"
-      script: ci/test.sh coverage-vltmt
+      stage: test
+      name: "Coverage vltmt set 0"
+      script: ci/test.sh coverage-vltmt0
+    - if: type = cron
+      dist: focal
+      compiler: gcc
+      stage: test
+      name: "Coverage vlt set 1"
+      script: ci/test.sh coverage-vlt1
+    - if: type = cron
+      dist: focal
+      compiler: gcc
+      stage: test
+      name: "Coverage vltmt set 1"
+      script: ci/test.sh coverage-vltmt1
 
 notifications:
   email:
diff --git a/ci/test.sh b/ci/test.sh
index 44d023912..48e03d20e 100755
--- a/ci/test.sh
+++ b/ci/test.sh
@@ -37,12 +37,20 @@ case $1 in
         nodist/code_coverage --scenarios=--dist
         bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info 
         ;;
-    coverage-vlt)
-        nodist/code_coverage --scenarios=--vlt
+    coverage-vlt0)
+        nodist/code_coverage --scenarios=--vlt --hashset=0/2
         bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info 
         ;;
-    coverage-vltmt)
-        nodist/code_coverage --scenarios=--vltmt
+    coverage-vlt1)
+        nodist/code_coverage --scenarios=--vlt --hashset=1/2
+        bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info 
+        ;;
+    coverage-vltmt0)
+        nodist/code_coverage --scenarios=--vltmt --hashset=0/2
+        bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info 
+        ;;
+    coverage-vltmt1)
+        nodist/code_coverage --scenarios=--vltmt --hashset=1/2
         bash <(curl -s https://codecov.io/bash) -f nodist/obj_dir/coverage/app_total.info 
         ;;
     *)
diff --git a/nodist/code_coverage b/nodist/code_coverage
index 183e4c4af..e6b6cc79e 100755
--- a/nodist/code_coverage
+++ b/nodist/code_coverage
@@ -29,6 +29,7 @@ $SIG{TERM} = sub { $Fork->kill_tree_all('TERM') if $Fork && $Fork->in_parent; di
 # main
 
 our $Opt_Fastcov = 0;  # out of memory
+our $Opt_Hashset;
 our $opt_stages = '';
 our $Opt_Scenarios;
 our %Opt_Stages;
@@ -38,6 +39,7 @@ autoflush STDERR 1;
 Getopt::Long::config("no_auto_abbrev");
 if (! GetOptions(
           "debug"       => sub { $Debug = 1; },
+          "hashset=s"   => \$Opt_Hashset,  # driver.pl hashset
           "<>"          => sub { die "%Error: Unknown parameter: $_[0]\n"; },
           "scenarios=s" => \$Opt_Scenarios,  # driver.pl scenarios
           "stages=s"    => \$opt_stages,  # starting stage number
@@ -97,6 +99,7 @@ sub test {
         run("make examples");
         run("make test_regress"
             . ($Opt_Scenarios ? " SCENARIOS='".$Opt_Scenarios."'" : "")
+            . ($Opt_Hashset ? " DRIVER_HASHSET='".$Opt_Hashset."'" : "")
             . ($Opt_Stop ? '' : ' || true'));
         travis_fold_end();
     }
@@ -376,6 +379,10 @@ This will rebuild the current object files.
 
 =over 4
 
+=item --hashset I<hashset>
+
+Pass test hashset onto driver.pl test harness.
+
 =item --help
 
 Displays this message and program version and exits.