Merge pull request #348 from Abdulwadoodd/cebreak

Fix `c.ebreak` test condition
riscv-non-isa · May 8, 2023 · 873d16e · 873d16e
2 parents f856b1a + 361cea5
commit 873d16e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [3.6.5] - 2023-05-06
+- Fix test condition in RVTEST_CASE for `c.ebreak` (RV32 and RV64) test. 
+
 ## [3.6.4] - 2023-05-04
 - In Zifencei test, updated the ISA string `zifencei` for `march` flag of toolchain.
 - Set the default definition of `RVMODEL_FENCEI` to `nop` in trap-handler.

diff --git a/riscv-test-suite/rv32i_m/C/src/cebreak-01.S b/riscv-test-suite/rv32i_m/C/src/cebreak-01.S
@@ -19,7 +19,7 @@ RVMODEL_BOOT
 RVTEST_CODE_BEGIN
 
 #ifdef TEST_CASE_1
-    RVTEST_CASE(1,"//check ISA:=regex(.*32.*); check ISA:=regex(.*I.*Zicsr.*.C*); def rvtest_mtrap_routine=True; def TEST_CASE_1=True",cebreak)
+    RVTEST_CASE(1,"//check ISA:=regex(.*32.*); check ISA:=regex(.*I.*C.*Zicsr); def rvtest_mtrap_routine=True; def TEST_CASE_1=True",cebreak)
 
     # ---------------------------------------------------------------------------------------------
 

diff --git a/riscv-test-suite/rv64i_m/C/src/cebreak-01.S b/riscv-test-suite/rv64i_m/C/src/cebreak-01.S
@@ -20,7 +20,7 @@ RVMODEL_BOOT
 RVTEST_CODE_BEGIN
 
 #ifdef TEST_CASE_1
-    RVTEST_CASE(1,"//check ISA:=regex(.*64.*); check ISA:=regex(.*I.*Zicsr.*.C*); def rvtest_mtrap_routine=True; def TEST_CASE_1=True",cebreak)
+    RVTEST_CASE(1,"//check ISA:=regex(.*64.*); check ISA:=regex(.*I.*C.*Zicsr); def rvtest_mtrap_routine=True; def TEST_CASE_1=True",cebreak)
 
     # ---------------------------------------------------------------------------------------------
     LA(     x1,test_A_res)