From efacac2e3dc70d145adf7ddc6b7f835def0ea038 Mon Sep 17 00:00:00 2001 From: Geza Lore Date: Sat, 18 Apr 2020 23:56:19 +0100 Subject: [PATCH] Tests: Ignore SystemC file paths in expected test results (#2265) --- test_regress/driver.pl | 1 + test_regress/t/t_time_sc_ms.out | 1 - test_regress/t/t_time_sc_sec.out | 1 - test_regress/t/t_time_sc_us.out | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/test_regress/driver.pl b/test_regress/driver.pl index 9ef588a21..65bb340f5 100755 --- a/test_regress/driver.pl +++ b/test_regress/driver.pl @@ -2015,6 +2015,7 @@ sub files_identical { && !/^- [a-z.0-9]+:\d+:[^\n]+\n/ && !/^-node:/ && !/^dot [^\n]+\n/ + && !/^In file: \/.*\/systemc-\d\.\d\.\d\/.*:\d+/ } @l1; @l1 = map { s/(Internal Error: [^\n]+\.cpp):[0-9]+:/$1:#:/; diff --git a/test_regress/t/t_time_sc_ms.out b/test_regress/t/t_time_sc_ms.out index 1c323b169..14f456687 100644 --- a/test_regress/t/t_time_sc_ms.out +++ b/test_regress/t/t_time_sc_ms.out @@ -1,6 +1,5 @@ Warning: (W516) default time unit changed to time resolution -In file: /svaha/sicortex/eda/systemc/systemc-2.3.3/systemc-2.3.3/src/sysc/kernel/sc_time.cpp:412 Time scale of t is 1ms / 1ms [20] In top.t: Hi - expect this is 20 *-* All Finished *-* diff --git a/test_regress/t/t_time_sc_sec.out b/test_regress/t/t_time_sc_sec.out index 545cd35d0..74cdb5ba8 100644 --- a/test_regress/t/t_time_sc_sec.out +++ b/test_regress/t/t_time_sc_sec.out @@ -1,6 +1,5 @@ Warning: (W516) default time unit changed to time resolution -In file: /svaha/sicortex/eda/systemc/systemc-2.3.3/systemc-2.3.3/src/sysc/kernel/sc_time.cpp:412 Time scale of t is 1s / 1s [20] In top.t: Hi - expect this is 20 *-* All Finished *-* diff --git a/test_regress/t/t_time_sc_us.out b/test_regress/t/t_time_sc_us.out index bfcaa2024..a2680e350 100644 --- a/test_regress/t/t_time_sc_us.out +++ b/test_regress/t/t_time_sc_us.out @@ -1,6 +1,5 @@ Warning: (W516) default time unit changed to time resolution -In file: /svaha/sicortex/eda/systemc/systemc-2.3.3/systemc-2.3.3/src/sysc/kernel/sc_time.cpp:412 Time scale of t is 1us / 1us [20] In top.t: Hi - expect this is 20 *-* All Finished *-*