From 19bad67a6e2c3fcaf4350e8c77b004659a27b0db Mon Sep 17 00:00:00 2001
From: "Bobby R. Bruce" <bbruce@ucdavis.edu>
Date: Tue, 1 Nov 2022 13:57:46 -0700
Subject: [PATCH] tests: Remove ARM compilation requirement for quick/Kokoro

The ARM Boot Tests required the compilation of ARM/gem5.opt to run a
quick test that the CHI protocol was functioning correctly with ARM and
the ArmBoard. This test has been removed and the test refactored
slightly to use the ALL/gem5.opt.

The CHI protocol is already tested nightly.

Change-Id: Ibe406348caefa2493860036eb89a20681478ea66
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/65195
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
---
 tests/gem5/arm-boot-tests/test_linux_boot.py | 22 +-------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/tests/gem5/arm-boot-tests/test_linux_boot.py b/tests/gem5/arm-boot-tests/test_linux_boot.py
index 6115bb29a5..364125691c 100644
--- a/tests/gem5/arm-boot-tests/test_linux_boot.py
+++ b/tests/gem5/arm-boot-tests/test_linux_boot.py
@@ -77,16 +77,12 @@ arm-boot-test"
 
     if mem_system == "chi":
         protocol_to_use = "CHI"
-        isa_to_use = constants.arm_tag
     elif mem_system == "mesi_two_level":
         protocol_to_use = None
-        isa_to_use = constants.all_compiled_tag
     elif mem_system == "mi_example":
         protocol_to_use = "MI_example"
-        isa_to_use = constants.arm_tag
     else:
         protocol_to_use = None
-        isa_to_use = constants.all_compiled_tag
 
     gem5_verify_config(
         name=name,
@@ -100,7 +96,7 @@ arm-boot-test"
             "arm_boot_exit_run.py",
         ),
         config_args=config_args,
-        valid_isas=(isa_to_use,),
+        valid_isas=(constants.all_compiled,),
         valid_hosts=constants.supported_hosts,
         length=length,
         protocol=protocol_to_use,
@@ -154,14 +150,6 @@ test_boot(
     to_tick=10000000000,
 )
 
-test_boot(
-    cpu="timing",
-    num_cpus=2,
-    mem_system="chi",
-    memory_class="DualChannelDDR4_2400",
-    length=constants.quick_tag,
-    to_tick=10000000000,
-)
 
 test_boot(
     cpu="timing",
@@ -172,14 +160,6 @@ test_boot(
     to_tick=10000000000,
 )
 
-test_boot(
-    cpu="timing",
-    num_cpus=2,
-    mem_system="mi_example",
-    memory_class="DualChannelDDR4_2400",
-    length=constants.quick_tag,
-    to_tick=10000000000,
-)
 
 #### The long (nightly) tests ####