Pārlūkot izejas kodu

[tests] Adjustments to interp disabled tests (#19748)

* [interp] Disable fullaotmixed suite on x86

* [interp] Small cleanup of disabled tests

Enable a bunch of tests on arm (which I thought I enabled 2 years ago). Avoid duplication by moving some arch specific disabled tests to all platforms. Enable a few tests that seem to have been fixed in the meantime.
Vlad Brezae 5 gadi atpakaļ
vecāks
revīzija
866914eeff
2 mainītis faili ar 12 papildinājumiem un 81 dzēšanām
  1. 7 80
      mono/tests/Makefile.am
  2. 5 1
      scripts/ci/run-test-interpreter.sh

+ 7 - 80
mono/tests/Makefile.am

@@ -1947,72 +1947,17 @@ INTERP_DISABLED_TESTS += calli_sig_check.exe
 
 
 # Test is too sensitive.
 # Test is too sensitive.
 INTERP_DISABLED_TESTS += localloc-noinit.exe
 INTERP_DISABLED_TESTS += localloc-noinit.exe
-
-# bug-48015.exe: be careful when re-enabling, it happens that it returns with exit code 0, but doesn't actually execute the test.
+INTERP_DISABLED_TESTS += dim-diamondshape.exe
+INTERP_DISABLED_TESTS += pinvoke3.exe
+INTERP_DISABLED_TESTS += cominterop.exe
 # bug-60862.exe: missing support to map IP->method; only works on platforms with altstack support.
 # bug-60862.exe: missing support to map IP->method; only works on platforms with altstack support.
-# bug-60843.exe: something goes wrong when turning the decoded enum value into a boxed enum, so the loaded value ends up being random bytes
-
-if ARM
-INTERP_DISABLED_TESTS += \
-	appdomain-unload-callback.exe \
-	appdomain-unload.exe \
-	assemblyresolve_event6.exe \
-	async-with-cb-throws.exe \
-	block_guard_restore_aligment_on_exit.exe \
-	bug-323114.exe \
-	bug-335131.2.exe \
-	bug-415577.exe \
-	bug-45841-fpstack-exceptions.exe \
-	bug-48015.exe \
-	bug-60862.exe \
-	bug-80307.exe \
-	bug-80392.2.exe \
-	bug445361.exe \
-	calliGenericTest.exe \
-	cominterop.exe \
-	context-static.exe \
-	delegate-async-exit.exe \
-	delegate-delegate-exit.exe \
-	delegate-exit.exe \
-	delegate1.exe \
-	delegate3.exe \
-	delegate5.exe \
-	delegate8.exe \
-	delegate9.exe \
-	dim-diamondshape.exe \
-	dynamic-method-stack-traces.exe \
-	even-odd.exe \
-	exception18.exe \
-	field-access.exe \
-	finalizer-exception.exe \
-	handleref.exe \
-	monitor-abort.exe \
-	nullable_boxing.2.exe \
-	pinvoke2.exe \
-	pinvoke3.exe \
-	remoting2.exe \
-	remoting3.exe \
-	safehandle.2.exe \
-	stackframes-async.2.exe \
-	static-constructor.exe \
-	threadpool-exceptions2.exe \
-	threadpool-exceptions3.exe \
-	threadpool-exceptions4.exe \
-	threadpool-exceptions5.exe \
-	threadpool-exceptions6.exe \
-	thunks.exe \
-	typeload-unaligned.exe \
-	vararg.exe \
-	vararg2.exe \
-	vararg3.exe
-endif
+INTERP_DISABLED_TESTS += bug-60862.exe
+# bug-48015.exe: remoting test that fails on fullaotinterp scenarios
+INTERP_DISABLED_TESTS += bug-48015.exe
 
 
 if ARM64
 if ARM64
 INTERP_DISABLED_TESTS += \
 INTERP_DISABLED_TESTS += \
-	bug-48015.exe \
-	bug-80307.exe \
-	dim-diamondshape.exe \
-	pinvoke3.exe
+	bug-80307.exe
 
 
 # Test is too sensitive.
 # Test is too sensitive.
 DISABLED_TESTS += localloc-noinit.exe
 DISABLED_TESTS += localloc-noinit.exe
@@ -2024,24 +1969,6 @@ if HOST_WIN32
 DISABLED_TESTS += localloc-noinit.exe
 DISABLED_TESTS += localloc-noinit.exe
 endif
 endif
 
 
-if AMD64
-INTERP_DISABLED_TESTS += \
-	assemblyresolve_event6.exe \
-	bug-48015.exe \
-	bug-60862.exe \
-	cominterop.exe \
-	dim-diamondshape.exe \
-	pinvoke3.exe
-endif
-
-if X86
-INTERP_DISABLED_TESTS += \
-	bug-60862.exe \
-	cominterop.exe \
-	dim-diamondshape.exe \
-	pinvoke3.exe
-endif
-
 TESTS_CS=$(filter-out $(DISABLED_TESTS),$(TESTS_CS_SRC:.cs=.exe))
 TESTS_CS=$(filter-out $(DISABLED_TESTS),$(TESTS_CS_SRC:.cs=.exe))
 TESTS_IL=$(filter-out $(DISABLED_TESTS),$(TESTS_IL_SRC:.il=.exe))
 TESTS_IL=$(filter-out $(DISABLED_TESTS),$(TESTS_IL_SRC:.il=.exe))
 TESTS_BENCH=$(filter-out $(DISABLED_TESTS),$(TESTS_BENCH_SRC:.cs=.exe))
 TESTS_BENCH=$(filter-out $(DISABLED_TESTS),$(TESTS_BENCH_SRC:.cs=.exe))

+ 5 - 1
scripts/ci/run-test-interpreter.sh

@@ -9,7 +9,11 @@ else ${TESTCMD} --label=interpreter-whitebox --timeout=10m make -C mono/mini int
 fi
 fi
 ${TESTCMD} --label=interpreter-regression --timeout=10m make -C mono/mini richeck
 ${TESTCMD} --label=interpreter-regression --timeout=10m make -C mono/mini richeck
 ${TESTCMD} --label=mixedmode-regression --timeout=10m make -C mono/mini mixedcheck
 ${TESTCMD} --label=mixedmode-regression --timeout=10m make -C mono/mini mixedcheck
-${TESTCMD} --label=fullaotmixed-regression --timeout=20m make -C mono/mini fullaotmixedcheck
+# Interp entry trampolines not yet implemented on x86. This has some full aot limitations
+if [[ ${CI_TAGS} == *'i386'* ]]
+then ${TESTCMD} --label=fullaotmixed-regression --skip
+else ${TESTCMD} --label=fullaotmixed-regression --timeout=20m make -C mono/mini fullaotmixedcheck
+fi
 ${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} test
 ${TESTCMD} --label=compile-runtime-tests --timeout=40m make -w -C mono/tests -j ${CI_CPU_COUNT} test
 ${TESTCMD} --label=runtime-interp --timeout=160m make -w -C mono/tests -k testinterp V=1
 ${TESTCMD} --label=runtime-interp --timeout=160m make -w -C mono/tests -k testinterp V=1
 ${TESTCMD} --label=corlib --timeout=160m make -w -C mcs/class/corlib run-test V=1
 ${TESTCMD} --label=corlib --timeout=160m make -w -C mcs/class/corlib run-test V=1