[tests] Collect and zip up the .NET unit tests for execution on Windows. (#11850)

Author: rolfbjarne

tests/.gitignore

@@ -29,9 +29,11 @@ Makefile.inc
 test.config
 test-system.config
 mac-test-package
+dotnet-test-package
 .nuget
 logs
 *.mSYM
 *.generated.cs
 x86
 bcl-test/templates
+*.7z

tests/Makefile

@@ -288,6 +288,14 @@ mac-test-package.zip:
 	@echo Not enabled
 endif
 
+ifdef INCLUDE_DOTNET
+dotnet-test-package.7z:
+	./package-dotnet-tests.sh
+else
+dotnet-test-package.7z:
+	@echo Not enabled
+endif
+
 #XI
 ifdef INCLUDE_IOS
 wrench-mtouch:

tests/common/Configuration.cs

@@ -187,7 +187,7 @@ static void ParseConfigFile (string file)
 			}
 		}
 
-		static string GetVariable (string variable, string @default)
+		internal static string GetVariable (string variable, string @default)
 		{
 			var result = Environment.GetEnvironmentVariable (variable);
 			if (string.IsNullOrEmpty (result))
@@ -305,11 +305,13 @@ public static string RootPath {
 				var path = Path.Combine (dir, ".git");
 				while (!Directory.Exists (path) && path.Length > 3) {
 					dir = Path.GetDirectoryName (dir);
+					if (dir == null)
+						throw new Exception ($"Could not find the xamarin-macios repo given the test assembly directory {TestAssemblyDirectory}");
 					path = Path.Combine (dir, ".git");
 				}
 				path = Path.GetDirectoryName (path);
 				if (!Directory.Exists (path))
-					throw new Exception ("Could not find the xamarin-macios repo");
+					throw new Exception ($"Could not find the xamarin-macios repo given the test assembly directory {TestAssemblyDirectory}");
 				return path;
 			}
 		}

tests/common/DotNet.cs

@@ -14,7 +14,7 @@ public static class DotNet {
 		public static string Executable {
 			get {
 				if (dotnet_executable == null) {
-					dotnet_executable = Configuration.EvaluateVariable ("DOTNET6");
+					dotnet_executable = Configuration.GetVariable ("DOTNET6", null);
 					if (string.IsNullOrEmpty (dotnet_executable))
 						throw new Exception ($"Could not find the dotnet executable.");
 					if (!File.Exists (dotnet_executable))

tests/dotnet/Makefile

@@ -30,11 +30,8 @@ TARGETS += \
 	../bgen/NuGet.config \
 	../bgen/global.json \
 
-# Example TEST_FILTER:
-#    TEST_FILTER="--filter FullyQualifiedName~BuildMyCocoaApp"
-# Docs: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details
 run-unit-tests:
-	cd UnitTests && $(DOTNET) test DotNetUnitTests.csproj $(TEST_FILTER)
+	$(MAKE) -C UnitTests $@
 
 all-local:: $(TARGETS)
 

tests/dotnet/UnitTests/Makefile

@@ -0,0 +1,19 @@
+TOP=../../..
+
+include $(TOP)/Make.config
+
+
+build:
+	$(DOTNET) build DotNetUnitTests.csproj
+
+publish:
+	$(DOTNET) publish DotNetUnitTests.csproj
+
+# Example TEST_FILTER:
+#    TEST_FILTER="--filter FullyQualifiedName~BuildMyCocoaApp"
+# Docs: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details
+run-unit-tests:
+	$(DOTNET) test DotNetUnitTests.csproj $(TEST_FILTER)
+
+run-published:
+	$(DOTNET) test bin/Debug/net5.0/publish/DotNetUnitTests.dll $(TEST_FILTER)

tests/package-dotnet-tests.sh

@@ -0,0 +1,45 @@
+#!/bin/bash -ex
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+
+# Clone files instead of copying them on APFS file systems. Much faster.
+CP="cp"
+if df -t apfs / >/dev/null 2>&1; then
+	CP="cp -c"
+fi
+
+#git clean -xfdq
+
+rm -Rf "$(pwd)/dotnet-test-package"
+DIR=$(pwd)/dotnet-test-package/xamarin-macios
+ZIP=$DIR.7z
+mkdir -p $DIR
+mkdir -p $DIR/tests/dotnet/UnitTests/bin/Debug/net5.0/
+mkdir -p $DIR/.git
+
+make -j8
+make -C dotnet/UnitTests publish
+
+$CP -r dotnet $DIR/tests/
+rm -Rf $DIR/tests/dotnet/packages
+
+# Various files to make 'make' work
+$CP -p ../Make.config $DIR
+$CP -p ../Make.versions $DIR
+$CP -p ../Make.config $DIR
+mkdir -p $DIR/mk
+$CP -p ../Make.config $DIR
+$CP -p ../mk/subdirs.mk $DIR/mk
+$CP -p ../mk/rules.mk $DIR/mk
+$CP -p ../mk/quiet.mk $DIR/mk
+$CP -p ../mk/mono.mk "$DIR/mk"
+
+# Files to make the unit tests run
+$CP -p dotnet/global.json $DIR/tests/global.json
+$CP -p ../NuGet.config $DIR
+$CP -p test.config $DIR/tests
+
+# Zip it all up
+rm -f dotnet-test-package.7z
+cd dotnet-test-package
+7z a ../dotnet-test-package.7z *