From 363e5cf20ec969e983f4ea1d86ab77838df122e3 Mon Sep 17 00:00:00 2001
From: Tim Newsome <tim@sifive.com>
Date: Thu, 7 Jan 2021 12:50:46 -0800
Subject: Stop testing `-rtos riscv`. (#314)

As of tomorrow that feature is officially no longer supported in
OpenOCD, so stop testing it.
---
 debug/Makefile                         |  6 +++---
 debug/targets/RISC-V/spike32-2-rtos.py | 20 --------------------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 debug/targets/RISC-V/spike32-2-rtos.py

diff --git a/debug/Makefile b/debug/Makefile
index 3efdea8..8f40a14 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -7,8 +7,8 @@ TESTS = $(shell $(GDBSERVER_PY) --list-tests $(src_dir)/targets/RISC-V/spike32.p
 
 default: spike$(XLEN) spike$(XLEN)-2
 
-all-tests: spike32 spike32-2 spike32-2-rtos spike32-2-hwthread \
-	spike64 spike64-2 spike64-2-rtos spike64-2-hwthread
+all-tests: spike32 spike32-2 spike32-2-hwthread \
+	spike64 spike64-2 spike64-2-hwthread
 
 all:	pylint all-tests
 
@@ -23,7 +23,7 @@ run.%:
 		--server_cmd $(RISCV)/bin/openocd
 
 # Target to check all the multicore options.
-multi-tests: spike32-2 spike64-2-rtos spike32-2-hwthread
+multi-tests: spike32-2 spike32-2-hwthread
 
 pylint:
 	pylint --rcfile=pylint.rc `git ls-files '*.py'`
diff --git a/debug/targets/RISC-V/spike32-2-rtos.py b/debug/targets/RISC-V/spike32-2-rtos.py
deleted file mode 100644
index 81029e8..0000000
--- a/debug/targets/RISC-V/spike32-2-rtos.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import targets
-import testlib
-
-import spike32  # pylint: disable=import-error
-
-class spike32_2(targets.Target):
-    harts = [spike32.spike32_hart(misa=0x40141129),
-            spike32.spike32_hart(misa=0x40141129)]
-    openocd_config_path = "spike-rtos.cfg"
-    timeout_sec = 30
-    implements_custom_test = True
-    support_hasel = False
-    test_semihosting = False
-    support_manual_hwbp = False # not supported with `-rtos riscv`
-    support_memory_sampling = False # not supported with `-rtos riscv`
-
-    def create(self):
-        return testlib.Spike(self, progbufsize=0, dmi_rti=4,
-                support_hasel=False, support_abstract_csr=True,
-                support_haltgroups=False)
-- 
cgit v1.1