Răsfoiți Sursa

Upstream a few test related commits from my Helix work (#11197)

* [bcl] Run System.Windows.Forms.DataVisualization tests

* [bcl] Run Mono.Messaging.* tests

* [bcl] Use correct label for mdoc tests

* [runtime] Skip verifying an xunit-binaries assembly
Alexander Köplinger 7 ani în urmă
părinte
comite
efd6c05aef

+ 0 - 6
mcs/class/Mono.Messaging.RabbitMQ/Mono.Messaging.RabbitMQ_test_net_2_0.dll.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-	<appSettings>
-		<add key="MONO_MESSAGING_PROVIDER" value="rabbitmq"/>
-	</appSettings>
-</configuration>

+ 1 - 0
mcs/class/Mono.Messaging/Mono.Messaging/ConnectionException.cs

@@ -32,6 +32,7 @@ using System;
 
 namespace Mono.Messaging {
 
+	[Serializable]
 	public class ConnectionException : MonoMessagingException {
 		private readonly QueueReference qRef;
 	

+ 1 - 1
mcs/class/Mono.Messaging/Mono.Messaging/MessageUnavailableException.cs

@@ -9,7 +9,7 @@ using System;
 namespace Mono.Messaging
 {
 	
-	
+	[Serializable]
 	public class MessageUnavailableException : MonoMessagingException
 	{
 		public MessageUnavailableException () : base ()

+ 1 - 0
mcs/class/Mono.Messaging/Mono.Messaging/MonoMessagingException.cs

@@ -32,6 +32,7 @@ using System;
 
 namespace Mono.Messaging {
 
+	[Serializable]
 	public class MonoMessagingException : Exception {
 		public MonoMessagingException () : base ()
 		{

+ 3 - 0
runtime/Makefile.am

@@ -162,6 +162,9 @@ if HOST_WIN32
 VERIFY_TESTS_FILTER += Mono.WebBrowser.dll
 endif
 
+# fails to verify with "VTable setup of type Xunit.NetCore.Extensions.SkippedTestCase failed", not sure why
+VERIFY_TESTS_FILTER += Xunit.NetCore.Extensions.dll
+
 if FULL_AOT_TESTS
 #  ILASM.exe has features which a testing_aot_full runtime will not support.
 #  It is invoked with an external mono when used in the runtime.

+ 8 - 1
scripts/ci/run-test-default.sh

@@ -37,6 +37,7 @@ else
     then ${TESTCMD} --label=Windows.Forms --timeout=5m xvfb-run -a -- make -w -C mcs/class/System.Windows.Forms run-test
     else echo "The simple test failed (maybe because of missing X server), skipping test suite." && ${TESTCMD} --label=Windows.Forms --skip; fi
 fi
+${TESTCMD} --label=System.Windows.Forms.DataVisualization --timeout=5m make -w -C mcs/class/System.Windows.Forms.DataVisualization run-test
 ${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test
 ${TESTCMD} --label=System.Data-xunit --timeout=5m make -w -C mcs/class/System.Data run-xunit-test
 if [[ ${CI_TAGS} == *'win-'* ]]; then ${TESTCMD} --label=Mono.Data.Sqlite --skip; else ${TESTCMD} --label=Mono.Data.Sqlite --timeout=5m make -w -C mcs/class/Mono.Data.Sqlite run-test; fi
@@ -86,6 +87,10 @@ ${TESTCMD} --label=System.Web.Extensions-standalone --timeout=5m make -w -C mcs/
 ${TESTCMD} --label=System.ComponentModel.DataAnnotations --timeout=5m make -w -C mcs/class/System.ComponentModel.DataAnnotations run-test
 ${TESTCMD} --label=System.ComponentModel.Composition-xunit --timeout=5m make -w -C mcs/class/System.ComponentModel.Composition.4.5 run-xunit-test
 ${TESTCMD} --label=Mono.CodeContracts --timeout=5m make -w -C mcs/class/Mono.CodeContracts run-test
+# needs RabbitMQ installed and hangs on process exit
+# ${TESTCMD} --label=System.Messaging --timeout=5m make -w -C mcs/class/System.Messaging run-test
+${TESTCMD} --label=Mono.Messaging --timeout=5m make -w -C mcs/class/Mono.Messaging run-test
+${TESTCMD} --label=Mono.Messaging.RabbitMQ --timeout=5m make -w -C mcs/class/Mono.Messaging.RabbitMQ run-test
 ${TESTCMD} --label=System.Runtime.Caching --timeout=5m make -w -C mcs/class/System.Runtime.Caching run-test
 ${TESTCMD} --label=System.Data.Services --timeout=5m make -w -C mcs/class/System.Data.Services run-test
 ${TESTCMD} --label=System.Web.DynamicData --timeout=5m make -w -C mcs/class/System.Web.DynamicData run-test
@@ -106,7 +111,9 @@ ${TESTCMD} --label=System.Runtime.CompilerServices.Unsafe-xunit --timeout=5m mak
 ${TESTCMD} --label=Mono.Debugger.Soft --timeout=5m make -w -C mcs/class/Mono.Debugger.Soft run-test
 ${TESTCMD} --label=Microsoft.CSharp-xunit --timeout=5m make -w -C mcs/class/Microsoft.CSharp run-xunit-test
 ${TESTCMD} --label=Microsoft.Build --timeout=5m make -w -C mcs/class/Microsoft.Build run-test
-if [[ ${CI_TAGS} == *'win-'* ]]; then ${TESTCMD} --label=monodoc --skip; else ${TESTCMD} --label=monodoc --timeout=10m make -w -C mcs/tools/mdoc run-test; fi
+# fails one test and needs to get rid of CallerFilePath to locate test resources
+# ${TESTCMD} --label=monodoc --timeout=10m make -w -C mcs/class/monodoc run-test
+if [[ ${CI_TAGS} == *'win-'* ]]; then ${TESTCMD} --label=mdoc --skip; else ${TESTCMD} --label=mdoc --timeout=10m make -w -C mcs/tools/mdoc run-test; fi
 ${TESTCMD} --label=Microsoft.Build-12 --timeout=10m make -w -C mcs/class/Microsoft.Build run-test PROFILE=xbuild_12
 ${TESTCMD} --label=Microsoft.Build.Engine-12 --timeout=60m make -w -C mcs/class/Microsoft.Build.Engine run-test PROFILE=xbuild_12
 ${TESTCMD} --label=Microsoft.Build.Framework-12 --timeout=60m make -w -C mcs/class/Microsoft.Build.Framework run-test PROFILE=xbuild_12