From 0e90d3f49196dc0476185a1e0634b407a2579826 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Wed, 12 Aug 2020 22:24:51 -0700 Subject: [PATCH] tests: Removed the hello tests from .testignore The "hello" tests that were previously ignored are all functioning correctly, and are therefore being re-included in the test suite. The MIPS and SPARC tests have been tagged a "long" as we do not compile these ISAs are part of our "quick" tests. Change-Id: I3aa079b81b938a12da6993213d158e53bc4ae514 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32914 Reviewed-by: Jason Lowe-Power Maintainer: Jason Lowe-Power Tested-by: kokoro --- tests/gem5/.testignore | 36 ---------------------------- tests/gem5/hello_se/test_hello_se.py | 11 +++++++++ 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/tests/gem5/.testignore b/tests/gem5/.testignore index dfca4e977..ace6a5d72 100644 --- a/tests/gem5/.testignore +++ b/tests/gem5/.testignore @@ -59,42 +59,6 @@ test-insttest-rv64i-linux-TimingSimpleCPU-RISCV-aarch64-fast test-insttest-rv64i-linux-DerivO3CPU-RISCV-aarch64-fast test-insttest-linux-AtomicSimpleCPU-SPARC-aarch64-fast test-insttest-linux-TimingSimpleCPU-SPARC-aarch64-fast -test-hello-linux-MinorCPU-RISCV-x86_64-debug -test-hello-linux-TimingSimpleCPU-SPARC-x86_64-debug -test-hello-linux-AtomicSimpleCPU-SPARC-x86_64-debug -test-hello-linux-TimingSimpleCPU-MIPS-x86_64-debug -test-hello-linux-AtomicSimpleCPU-MIPS-x86_64-debug -test-hello-linux-DerivO3CPU-MIPS-x86_64-debug -test-hello-linux-MinorCPU-RISCV-x86_64-fast -test-hello-linux-TimingSimpleCPU-SPARC-x86_64-fast -test-hello-linux-AtomicSimpleCPU-SPARC-x86_64-fast -test-hello-linux-TimingSimpleCPU-MIPS-x86_64-fast -test-hello-linux-AtomicSimpleCPU-MIPS-x86_64-fast -test-hello-linux-DerivO3CPU-MIPS-x86_64-fast -test-hello-linux-MinorCPU-RISCV-x86_64-opt -test-hello-linux-TimingSimpleCPU-SPARC-x86_64-opt -test-hello-linux-AtomicSimpleCPU-SPARC-x86_64-opt -test-hello-linux-TimingSimpleCPU-MIPS-x86_64-opt -test-hello-linux-AtomicSimpleCPU-MIPS-x86_64-opt -test-hello-linux-DerivO3CPU-MIPS-x86_64-opt -test-hello-linux-MinorCPU-RISCV-aarch64-debug -test-hello-linux-TimingSimpleCPU-SPARC-aarch64-debug -test-hello-linux-AtomicSimpleCPU-SPARC-aarch64-debug -test-hello-linux-TimingSimpleCPU-MIPS-aarch64-debug -test-hello-linux-AtomicSimpleCPU-MIPS-aarch64-debug -test-hello-linux-DerivO3CPU-MIPS-aarch64-debug -test-hello-linux-MinorCPU-RISCV-aarch64-fast -test-hello-linux-TimingSimpleCPU-SPARC-aarch64-fast -test-hello-linux-AtomicSimpleCPU-SPARC-aarch64-fast -test-hello-linux-TimingSimpleCPU-MIPS-aarch64-fast -test-hello-linux-AtomicSimpleCPU-MIPS-aarch64-fast -test-hello-linux-DerivO3CPU-MIPS-aarch64-fast -test-hello-linux-MinorCPU-RISCV-aarch64-opt -test-hello-linux-TimingSimpleCPU-SPARC-aarch64-opt -test-hello-linux-AtomicSimpleCPU-SPARC-aarch64-opt -test-hello-linux-TimingSimpleCPU-MIPS-aarch64-opt -test-hello-linux-AtomicSimpleCPU-MIPS-aarch64-opt -test-hello-linux-DerivO3CPU-MIPS-aarch64-opt test-atomic-DerivO3CPU-SPARC-x86_64-opt test-atomic-TimingSimpleCPU-SPARC-x86_64-opt test-atomic-DerivO3CPU-SPARC-x86_64-debug diff --git a/tests/gem5/hello_se/test_hello_se.py b/tests/gem5/hello_se/test_hello_se.py index 96f6d33a3..c7cf7fe52 100644 --- a/tests/gem5/hello_se/test_hello_se.py +++ b/tests/gem5/hello_se/test_hello_se.py @@ -72,6 +72,16 @@ supported_os = { 'sparc' : ('linux',) } +# We only want to test x86, arm, and riscv on quick. Mips and sparc will be +# left for long. +os_length = { + 'x86': constants.quick_tag, + 'arm' : constants.quick_tag, + 'mips' : constants.long_tag, + 'riscv' : constants.quick_tag, + 'sparc' : constants.long_tag, +} + if config.bin_path: base_path = config.bin_path else: @@ -99,6 +109,7 @@ def verify_config(isa, binary, operating_s, cpu, hosts): '--caches'], valid_isas=(isa.upper(),), valid_hosts=hosts, + length = os_length[isa], ) # Run statically linked hello worlds -- 2.30.2