From c3271aa8916699b6e40f3d82fd3d049af0f9f80f Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 2 Jun 2020 21:42:24 -0400
Subject: [PATCH] Fix duplicate VLCOVGEN short code

---
 include/verilated_cov_key.h | 4 ++--
 src/vlcovgen                | 2 +-
 test_regress/driver.pl      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/verilated_cov_key.h b/include/verilated_cov_key.h
index 46c9311dd..d4788d435 100644
--- a/include/verilated_cov_key.h
+++ b/include/verilated_cov_key.h
@@ -38,7 +38,7 @@ VLCOVGEN_ITEM("name=>'filename',    short=>'f',  group=>1, default=>undef, descr
 VLCOVGEN_ITEM("name=>'groupdesc',   short=>'d',  group=>1, default=>'',    descr=>'Description of the covergroup this item belongs to'")
 VLCOVGEN_ITEM("name=>'groupname',   short=>'g',  group=>1, default=>'',    descr=>'Group name of the covergroup this item belongs to'")
 VLCOVGEN_ITEM("name=>'groupcmt',    short=>'O',  group=>1, default=>'',    ")
-VLCOVGEN_ITEM("name=>'linescov',    short=>'L',  group=>1, default=>'',    descr=>'List of comma-separated lines covered'")
+VLCOVGEN_ITEM("name=>'linescov',    short=>'S',  group=>1, default=>'',    descr=>'List of comma-separated lines covered'")
 VLCOVGEN_ITEM("name=>'per_instance',short=>'P',  group=>1, default=>0,     descr=>'True if every hierarchy is independently counted; otherwise all hierarchies will be combined into a single count'")
 VLCOVGEN_ITEM("name=>'row0_name',   short=>'R0', group=>1, default=>undef, descr=>'The row title for the header line of this row'")
 VLCOVGEN_ITEM("name=>'row1_name',   short=>'R1', group=>1, default=>undef, ")
@@ -81,7 +81,7 @@ VLCOVGEN_ITEM("name=>'weight',      short=>'w',  group=>0, default=>undef, descr
 #define VL_CIK_HIER "h"
 #define VL_CIK_LIMIT "L"
 #define VL_CIK_LINENO "l"
-#define VL_CIK_LINESCOV "L"
+#define VL_CIK_LINESCOV "S"
 #define VL_CIK_PER_INSTANCE "P"
 #define VL_CIK_ROW0 "r0"
 #define VL_CIK_ROW0_NAME "R0"
diff --git a/src/vlcovgen b/src/vlcovgen
index c99d9aa88..c5a3e2a7f 100755
--- a/src/vlcovgen
+++ b/src/vlcovgen
@@ -65,7 +65,7 @@ sub lint {
     my $ok = 1;
     foreach my $itemref (@Items) {
         if ($shorts{$itemref->{short}}) {
-            warn "%Error: Duplicate short code: $itemref->{short},";
+            die "%Error: Duplicate short code: $itemref->{short},";
             $ok = 0;
         }
         $shorts{$itemref->{short}} = 1;
diff --git a/test_regress/driver.pl b/test_regress/driver.pl
index 149310b84..68f138d79 100755
--- a/test_regress/driver.pl
+++ b/test_regress/driver.pl
@@ -396,7 +396,7 @@ sub one_test {
              }
              $self->{left_cnt}--;
              $self->print_summary;
-             delete $self->{running_ids}{$process->{running_id}};
+             delete $self->{running_ids}{$process->{running_id}} if $process->{running_id};
          },
          )->ready();
 }