From 0495b7e9e795fafbaeac55b6d84db51a5cf975a8 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Wed, 4 Sep 2013 13:22:57 -0400 Subject: [PATCH] tests: Move ISA-independent tests to the NULL ISA This patch simply takes a first step to use the NULL ISA build for tests that do not make use of a CPU. Most of the Ruby tests could go the same way, but to avoid duplicating a lot of compilation targets that will have to wait until Ruby is built as a library and linked in independently. --HG-- rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini => tests/quick/se/50.memtest/ref/null/none/memtest/config.ini rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr => tests/quick/se/50.memtest/ref/null/none/memtest/simerr rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest/simout => tests/quick/se/50.memtest/ref/null/none/memtest/simout rename : tests/quick/se/50.memtest/ref/alpha/linux/memtest/stats.txt => tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simerr => tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simout => tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt => tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simerr => tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simerr rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simout => tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout rename : tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt => tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt --- .../ref/{alpha/linux => null/none}/memtest/config.ini | 0 .../50.memtest/ref/{alpha/linux => null/none}/memtest/simerr | 0 .../50.memtest/ref/{alpha/linux => null/none}/memtest/simout | 0 .../ref/{alpha/linux => null/none}/memtest/stats.txt | 0 .../ref/{arm/linux => null/none}/tgen-simple-dram/simerr | 0 .../ref/{arm/linux => null/none}/tgen-simple-dram/simout | 0 .../ref/{arm/linux => null/none}/tgen-simple-dram/stats.txt | 0 .../ref/{arm/linux => null/none}/tgen-simple-mem/simerr | 0 .../ref/{arm/linux => null/none}/tgen-simple-mem/simout | 0 .../ref/{arm/linux => null/none}/tgen-simple-mem/stats.txt | 0 tests/run.py | 4 +++- 11 files changed, 3 insertions(+), 1 deletion(-) rename tests/quick/se/50.memtest/ref/{alpha/linux => null/none}/memtest/config.ini (100%) rename tests/quick/se/50.memtest/ref/{alpha/linux => null/none}/memtest/simerr (100%) rename tests/quick/se/50.memtest/ref/{alpha/linux => null/none}/memtest/simout (100%) rename tests/quick/se/50.memtest/ref/{alpha/linux => null/none}/memtest/stats.txt (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-dram/simerr (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-dram/simout (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-dram/stats.txt (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-mem/simerr (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-mem/simout (100%) rename tests/quick/se/70.tgen/ref/{arm/linux => null/none}/tgen-simple-mem/stats.txt (100%) diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini b/tests/quick/se/50.memtest/ref/null/none/memtest/config.ini similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/config.ini rename to tests/quick/se/50.memtest/ref/null/none/memtest/config.ini diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr b/tests/quick/se/50.memtest/ref/null/none/memtest/simerr similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/simerr rename to tests/quick/se/50.memtest/ref/null/none/memtest/simerr diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/simout b/tests/quick/se/50.memtest/ref/null/none/memtest/simout similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/simout rename to tests/quick/se/50.memtest/ref/null/none/memtest/simout diff --git a/tests/quick/se/50.memtest/ref/alpha/linux/memtest/stats.txt b/tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt similarity index 100% rename from tests/quick/se/50.memtest/ref/alpha/linux/memtest/stats.txt rename to tests/quick/se/50.memtest/ref/null/none/memtest/stats.txt diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simerr b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simerr rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simerr diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/simout rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/simout diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-dram/stats.txt rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-dram/stats.txt diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simerr b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simerr similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simerr rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simerr diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simout b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/simout rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/simout diff --git a/tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt b/tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt similarity index 100% rename from tests/quick/se/70.tgen/ref/arm/linux/tgen-simple-mem/stats.txt rename to tests/quick/se/70.tgen/ref/null/none/tgen-simple-mem/stats.txt diff --git a/tests/run.py b/tests/run.py index bc76717c0..461813559 100644 --- a/tests/run.py +++ b/tests/run.py @@ -192,8 +192,10 @@ def initCPUs(sys): def initCPU(cpu): # We might actually have a MemTest object or something similar # here that just pretends to be a CPU. - if isinstance(cpu, BaseCPU): + try: cpu.createThreads() + except: + pass # The CPU attribute doesn't exist in some cases, e.g. the Ruby # testers. -- 2.30.2