Run vNext tests from command line

Create an additional build in Jenkins to run .NET Standard tests

Author: jdom

Build.cmd

@@ -1,2 +1,22 @@
+@if not defined _echo @echo off
+setlocal
+
+if [%1]==[]                GOTO NETFX
+if [%1]==[netfx]           GOTO NETFX
+if [%1]==[netstandard-win] GOTO VNEXT
+if [%1]==[netstandard]     GOTO VNEXT
+if [%1]==[all]             GOTO ALL
+
+:NETFX
 cmd /c "%~dp0src\Build.cmd"
-REM cmd /c "%~dp0vNext\src\Build.cmd"
+GOTO END
+
+:VNEXT
+cmd /c "%~dp0vNext\src\Build.cmd"
+GOTO END
+
+:ALL
+cmd /c "%~dp0src\Build.cmd"
+cmd /c "%~dp0vNext\src\Build.cmd"
+
+:END

Test.cmd

@@ -1 +1,22 @@
-"%~dp0src\Test.cmd"
+@if not defined _echo @echo off
+setlocal
+
+if [%1]==[]                GOTO NETFX
+if [%1]==[netfx]           GOTO NETFX
+if [%1]==[netstandard-win] GOTO VNEXT
+if [%1]==[netstandard]     GOTO VNEXT
+if [%1]==[all]             GOTO ALL
+
+:NETFX
+cmd /c "%~dp0src\Test.cmd"
+GOTO END
+
+:VNEXT
+cmd /c "%~dp0vNext\src\Test.cmd"
+GOTO END
+
+:ALL
+cmd /c "%~dp0src\Test.cmd"
+cmd /c "%~dp0vNext\src\Test.cmd"
+
+:END

TestAll.cmd

@@ -1 +1,22 @@
-"%~dp0src\TestAll.cmd"
+@if not defined _echo @echo off
+setlocal
+
+if [%1]==[]                GOTO NETFX
+if [%1]==[netfx]           GOTO NETFX
+if [%1]==[netstandard-win] GOTO VNEXT
+if [%1]==[netstandard]     GOTO VNEXT
+if [%1]==[all]             GOTO ALL
+
+:NETFX
+cmd /c "%~dp0src\TestAll.cmd"
+GOTO END
+
+:VNEXT
+cmd /c "%~dp0vNext\src\TestAll.cmd"
+GOTO END
+
+:ALL
+cmd /c "%~dp0src\TestAll.cmd"
+cmd /c "%~dp0vNext\src\TestAll.cmd"
+
+:END

netci.groovy

@@ -10,21 +10,30 @@ def buildString = '''call Build.cmd && Test.cmd'''
 // Generate the builds for debug and release
 
 [true, false].each { isPR ->
-    def newJob = job(Utilities.getFullJobName(project, '', isPR)) {
-        steps {
-            batchFile(buildString)
+    ['netfx', 'netstandard-win'].each { platform ->
+	    def newJobName = platform
+		def newJob = job(Utilities.getFullJobName(project, newJobName, isPR)) {
+			steps {
+				batchFile("call Build.cmd ${platform} && Test.cmd ${platform}")
+			}
+		}
+		
+        if (platform == 'netfx') {
+            Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto')
+        } else {
+            // need to use a machine that has .NET 4.6.2 installed in the system
+            Utilities.setMachineAffinity(newJob, 'Windows_NT', '20161027')
         }
-    }
-    
-    Utilities.setMachineAffinity(newJob, 'Windows_NT', 'latest-or-auto')
-    Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
-    Utilities.addXUnitDotNETResults(newJob, '**/xUnit-Results*.xml')
-    // Archive only on commit builds.
-    if (!isPR) {
-        Utilities.addArchival(newJob, 'Binaries/**')
-        Utilities.addGithubPushTrigger(newJob)
-    }
-    else {
-        Utilities.addGithubPRTriggerForBranch(newJob, branch, "Windows Debug and Release")
-    }
+		
+		Utilities.standardJobSetup(newJob, project, isPR, "*/${branch}")
+		Utilities.addXUnitDotNETResults(newJob, '**/xUnit-Results*.xml')
+		// Archive only on commit builds.
+		if (!isPR) {
+			Utilities.addArchival(newJob, 'Binaries/**')
+			Utilities.addGithubPushTrigger(newJob)
+		}
+		else {
+			Utilities.addGithubPRTriggerForBranch(newJob, branch, "${platform} Windows Debug and Release")
+		}
+	}
 }

vNext/.nuget/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="xunit.runner.console" version="2.1.0" />
+</packages>

vNext/.nuget/NuGet.Config vNext/src/.nuget/NuGet.Config

@@ -27,8 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestExtensions", "..\test\T
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{5478B454-0E48-4631-B338-D45DD21124BF}"
 	ProjectSection(SolutionItems) = preProject
-		..\.nuget\NuGet.Config = ..\.nuget\NuGet.Config
-		..\.nuget\packages.config = ..\.nuget\packages.config
+		.nuget\NuGet.Config = .nuget\NuGet.Config
+		.nuget\packages.config = .nuget\packages.config
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestInternalGrains", "..\test\TestInternalGrains\TestInternalGrains.csproj", "{A682ABC1-1A51-4794-8012-DA8E59EBC72A}"

vNext/src/.nuget/packages.config

@@ -0,0 +1,28 @@
+@setlocal
+@ECHO off
+
+SET CONFIGURATION=Release
+
+SET CMDHOME=%~dp0
+@REM Remove trailing backslash \
+set CMDHOME=%CMDHOME:~0,-1%
+
+pushd "%CMDHOME%"
+@cd
+
+SET OutDir=%CMDHOME%\..\Binaries\%CONFIGURATION%
+
+REM set TESTS=%OutDir%\Tester.dll,%OutDir%\TesterInternal.dll,%OutDir%\Orleans.NonSiloTests.dll
+set TESTS=%OutDir%\Tester.dll,%OutDir%\Orleans.NonSiloTests.dll
+if []==[%TEST_FILTERS%] set TEST_FILTERS=-trait 'Category=BVT' -trait 'Category=SlowBVT'
+
+@Echo Test assemblies = %TESTS%
+@Echo Test filters = %TEST_FILTERS%
+@echo on
+REM call "%CMDHOME%\SetupTestScript.cmd" "%OutDir%"
+
+PowerShell -NoProfile -ExecutionPolicy Bypass -Command "& ../../src/Parallel-Tests.ps1 -assemblies %TESTS% -testFilter \"%TEST_FILTERS%\" -outDir '%OutDir%'"
+set testresult=%errorlevel%
+popd
+endlocal&set testresult=%testresult%
+exit /B %testresult%

vNext/src/Orleans.vNext.sln

@@ -0,0 +1,16 @@
+@setlocal
+@ECHO off
+
+SET CMDHOME=%~dp0
+@REM Remove trailing backslash \
+set CMDHOME=%CMDHOME:~0,-1%
+
+@REM Due to more of Windows .cmd script parameter passing quirks, we can't pass this value as cmdline argument, 
+@REM  so we need to pass it in through the back door as environment variable, scoped by setlocal
+set TEST_FILTERS=-trait "Category=BVT" -trait "Category=SlowBVT" -trait "Category=Functional"
+
+@REM Note: We transfer _complete_ control to the Test.cmd script here because we don't use CALL.
+
+"%CMDHOME%\Test.cmd"
+
+@REM Note: Execution will NOT return here, and the exit code returned to the caller will be whatever the other script returned.