From 41e362b58029c6d50dcd0ec9c117cca2cdd96d69 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Wed, 27 May 2020 21:44:28 -0400
Subject: [PATCH] Tests: Remove some old conditional-fail checks.

---
 test_regress/t/t_clk_latch.pl           | 2 +-
 test_regress/t/t_clk_latch_edgestyle.pl | 2 +-
 test_regress/t/t_func_public_trace.pl   | 4 +---
 test_regress/t/t_order_doubleloop.pl    | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test_regress/t/t_clk_latch.pl b/test_regress/t/t_clk_latch.pl
index 6823f8581..1f8ac0132 100755
--- a/test_regress/t/t_clk_latch.pl
+++ b/test_regress/t/t_clk_latch.pl
@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-my $fail = ($Self->{vlt_all} && verilator_version() !~ /\(ord\)/);
+my $fail = $Self->{vlt_all};
 
 compile(
     );
diff --git a/test_regress/t/t_clk_latch_edgestyle.pl b/test_regress/t/t_clk_latch_edgestyle.pl
index 1df8bd38f..ca72a6975 100755
--- a/test_regress/t/t_clk_latch_edgestyle.pl
+++ b/test_regress/t/t_clk_latch_edgestyle.pl
@@ -12,7 +12,7 @@ scenarios(simulator => 1);
 
 top_filename("t/t_clk_latch.v");
 
-my $fail = ($Self->{vlt_all} && verilator_version() !~ /\(ord\)/);
+my $fail = $Self->{vlt_all};
 
 compile(
     v_flags2 => ['+define+EDGE_DETECT_STYLE'],
diff --git a/test_regress/t/t_func_public_trace.pl b/test_regress/t/t_func_public_trace.pl
index 53042e553..a8afb6674 100755
--- a/test_regress/t/t_func_public_trace.pl
+++ b/test_regress/t/t_func_public_trace.pl
@@ -10,12 +10,10 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-my $pubtask = ($Self->{vlt_all} && verilator_version() =~ /\(public_tasks\)/);  # TBD
-
 top_filename("t/t_func_public.v");
 
 compile(
-    verilator_flags2 => [($pubtask?'-DVERILATOR_PUBLIC_TASKS':''), "--trace"],
+    verilator_flags2 => ["--trace"],
     fails => $fail,
     );
 
diff --git a/test_regress/t/t_order_doubleloop.pl b/test_regress/t/t_order_doubleloop.pl
index 6823f8581..1f8ac0132 100755
--- a/test_regress/t/t_order_doubleloop.pl
+++ b/test_regress/t/t_order_doubleloop.pl
@@ -10,7 +10,7 @@ if (!$::Driver) { use FindBin; exec("$FindBin::Bin/bootstrap.pl", @ARGV, $0); di
 
 scenarios(simulator => 1);
 
-my $fail = ($Self->{vlt_all} && verilator_version() !~ /\(ord\)/);
+my $fail = $Self->{vlt_all};
 
 compile(
     );