Switch to testing the riscv target that can be tested with qemu. (#2035)
BUG=http://b/286622884
diff --git a/tensorflow/lite/micro/tools/ci_build/test_riscv.sh b/tensorflow/lite/micro/tools/ci_build/test_riscv.sh
index f98c388..d511bd9 100755
--- a/tensorflow/lite/micro/tools/ci_build/test_riscv.sh
+++ b/tensorflow/lite/micro/tools/ci_build/test_riscv.sh
@@ -22,7 +22,7 @@
EXTERNAL_DIR=${2}
source ${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/ci_build/helper_functions.sh
-TARGET=riscv32_mcu
+TARGET=riscv32_generic
readable_run make -f ${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile TARGET=${TARGET} third_party_downloads TENSORFLOW_ROOT=${TENSORFLOW_ROOT} EXTERNAL_DIR=${EXTERNAL_DIR}
@@ -34,4 +34,3 @@
# debugging info on failures.
readable_run make -f ${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile clean TENSORFLOW_ROOT=${TENSORFLOW_ROOT} EXTERNAL_DIR=${EXTERNAL_DIR}
readable_run make -j8 -f ${TENSORFLOW_ROOT}tensorflow/lite/micro/tools/make/Makefile TARGET=${TARGET} BUILD_TYPE=debug test TENSORFLOW_ROOT=${TENSORFLOW_ROOT} EXTERNAL_DIR=${EXTERNAL_DIR}
-
diff --git a/tensorflow/lite/micro/tools/make/targets/riscv32_generic_makefile.inc b/tensorflow/lite/micro/tools/make/targets/riscv32_generic_makefile.inc
index a668f19..ce5f0eb 100644
--- a/tensorflow/lite/micro/tools/make/targets/riscv32_generic_makefile.inc
+++ b/tensorflow/lite/micro/tools/make/targets/riscv32_generic_makefile.inc
@@ -34,6 +34,12 @@
LDFLAGS += --specs=nano.specs
+# See http://b/158651472 for why memory arena threshold test is disabled.
+EXCLUDED_TESTS := \
+ $(TENSORFLOW_ROOT)tensorflow/lite/micro/memory_arena_threshold_test.cc
+
+MICROLITE_TEST_SRCS := $(filter-out $(EXCLUDED_TESTS), $(MICROLITE_TEST_SRCS))
+
# This disables the "linker relaxation" optimization, which produced incorrect code.
# TODO(b/279805615): Check whether this is fixed in newer versions of the toolchain.
LDFLAGS += -mno-relax
