From 90c917ee836b95bd3ace99da6319d3b46fc07641 Mon Sep 17 00:00:00 2001
From: Geza Lore <gezalore@gmail.com>
Date: Fri, 23 Jul 2021 17:16:10 +0100
Subject: [PATCH] Enable now supported tests for string array initializers

Fixes #2895.
---
 Changes                                 |  3 ++-
 test_regress/t/t_unpacked_str_init.pl   |  3 +--
 test_regress/t/t_unpacked_str_init2.out | 34 +++++++++++++++++++++++++
 test_regress/t/t_unpacked_str_init2.pl  |  8 +++---
 4 files changed, 42 insertions(+), 6 deletions(-)
 create mode 100644 test_regress/t/t_unpacked_str_init2.out

diff --git a/Changes b/Changes
index e4ed2a737..4b4f51fbd 100644
--- a/Changes
+++ b/Changes
@@ -13,11 +13,12 @@ Verilator 4.211 devel
 
 **Minor:**
 
-* Fix -G to treat simple integer literals as signed (#3060). [Anikin1610]
 * Output files are split based on the set of headers required
   in order to aid incremental compilation via ccache (#3071). [Geza Lore]
 * Parameter values are now emitted as 'static constexpr' instead of enum.
   C++ direct references to parameters might require updating (#3077). [Geza Lore]
+* Fix -G to treat simple integer literals as signed (#3060). [Anikin1610]
+* Fix emitted string array initializers (#2895). [Iztok Jeras]
 
 
 Verilator 4.210 2021-07-07
diff --git a/test_regress/t/t_unpacked_str_init.pl b/test_regress/t/t_unpacked_str_init.pl
index 235ca326a..baf0745f9 100755
--- a/test_regress/t/t_unpacked_str_init.pl
+++ b/test_regress/t/t_unpacked_str_init.pl
@@ -10,8 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-# TODO change to compile()
-lint(
+compile(
     );
 
 # No execute, not self-checking
diff --git a/test_regress/t/t_unpacked_str_init2.out b/test_regress/t/t_unpacked_str_init2.out
new file mode 100644
index 000000000..349ba5028
--- /dev/null
+++ b/test_regress/t/t_unpacked_str_init2.out
@@ -0,0 +1,34 @@
+REGX: zero
+REGX: ra
+REGX: sp
+REGX: gp
+REGX: tp
+REGX: t0
+REGX: t1
+REGX: t2
+REGX: s0/fp
+REGX: s1
+REGX: a0
+REGX: a1
+REGX: a2
+REGX: a3
+REGX: a4
+REGX: a5
+REGX: a6
+REGX: a7
+REGX: s2
+REGX: s3
+REGX: s4
+REGX: s5
+REGX: s6
+REGX: s7
+REGX: s8
+REGX: s9
+REGX: s10
+REGX: s11
+REGX: t3
+REGX: t4
+REGX: t5
+REGX: t6
+OP: ILLEGAL
+*-* All Finished *-*
diff --git a/test_regress/t/t_unpacked_str_init2.pl b/test_regress/t/t_unpacked_str_init2.pl
index 235ca326a..bd862f553 100755
--- a/test_regress/t/t_unpacked_str_init2.pl
+++ b/test_regress/t/t_unpacked_str_init2.pl
@@ -10,11 +10,13 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-# TODO change to compile()
-lint(
+compile(
     );
 
-# No execute, not self-checking
+execute(
+    check_finished => 1,
+    expect_filename => $Self->{golden_filename}
+    );
 
 ok(1);
 1;