Merge pull request #793 from richardjharding/addTestAdaptorPath

Add test adapter path to vs test params
fsprojects · May 17, 2015 · ac46f8b · ac46f8b
2 parents ec27e1f + c9cbd17
commit ac46f8b
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/app/FakeLib/UnitTest/VSTest.fs b/src/app/FakeLib/UnitTest/VSTest.fs
@@ -54,7 +54,9 @@ type VSTestParams =
       /// A timeout for the test runner (optional).
       TimeOut : TimeSpan
       /// Error level for controlling how VSTest failures should break the build (optional).
-      ErrorLevel : ErrorLevel }
+      ErrorLevel : ErrorLevel 
+      /// Path to test adapter e.g. xUnit (optional)
+      TestAdapterPath: string}
 
 /// VSTest default parameters.
 let VSTestDefaults = 
@@ -78,7 +80,8 @@ let VSTestDefaults =
           | None -> ""
       WorkingDir = null
       TimeOut = TimeSpan.MaxValue
-      ErrorLevel = ErrorLevel.Error }
+      ErrorLevel = ErrorLevel.Error
+      TestAdapterPath = null }
 
 /// Builds the command line arguments from the given parameter record and the given assemblies.
 /// [omit]
@@ -103,6 +106,7 @@ let buildVSTestArgs (parameters : VSTestParams) assembly =
     |> appendIfTrue parameters.ListExecutors "/ListExecutors"
     |> appendIfTrue parameters.ListLoggers "/ListLoggers"
     |> appendIfTrue parameters.ListSettingsProviders "/ListSettingsProviders"
+    |> appendIfNotNull parameters.TestAdapterPath "/TestAdapterPath:"
     |> toText
 
 /// Runs VSTest command line tool (VSTest.Console.exe) on a group of assemblies.