Merge pull request #30 from nunit/issue-29

Updates to zipPackage, NUnitLiteRunner
nunit · Oct 7, 2024 · 8656ced · 8656ced
2 parents cd5348b + 94f01b5
commit 8656ced
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/recipe/package-definition.cake b/recipe/package-definition.cake
@@ -275,7 +275,7 @@ public abstract class PackageDefinition
             throw new Exception("One or more package tests had errors!");
     }
 
-    private void InstallExtensions(ExtensionSpecifier[] extensionsNeeded)
+    protected virtual void InstallExtensions(ExtensionSpecifier[] extensionsNeeded)
     {
         foreach (ExtensionSpecifier extension in extensionsNeeded)
             extension.InstallExtension(this);

diff --git a/recipe/test-runners.cake b/recipe/test-runners.cake
@@ -143,8 +143,17 @@ public class TestRunnerSource
 // For NUnitLite tests, the test is run directly
 public class NUnitLiteRunner : TestRunner, IUnitTestRunner
 {
-    public int RunUnitTest(FilePath testPath) =>
-        RunTest(testPath, BuildSettings.UnitTestArguments);
+    public int RunUnitTest(FilePath testPath)
+    {
+        var processSettings = new ProcessSettings { Arguments = BuildSettings.UnitTestArguments };
+        if (CommandLineOptions.TraceLevel.Exists)
+            processSettings.EnvironmentVariables = new Dictionary<string, string>
+            {
+                { "NUNIT_INTERNAL_TRACE_LEVEL", CommandLineOptions.TraceLevel.Value }
+            };
+
+        return RunTest(testPath, processSettings);
+    }
 }
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/recipe/zip-package.cake b/recipe/zip-package.cake
@@ -22,6 +22,7 @@ public class ZipPackage : PackageDefinition
 
     // ZIP package supports bundling of extensions
     public PackageReference[] BundledExtensions { get; }
+    public bool HasBundledExtensions => BundledExtensions != null;
 
     // The file name of this package, including extension
     public override string PackageFileName => $"{PackageId}-{PackageVersion}.zip";
@@ -46,6 +47,12 @@ public class ZipPackage : PackageDefinition
         _context.Unzip($"{BuildSettings.PackageDirectory}{PackageFileName}", $"{PackageInstallDirectory}{PackageId}.{PackageVersion}");
     }
 
+    protected override void InstallExtensions(ExtensionSpecifier[] extensionsNeeded)
+    {
+        // TODO: Do nothing for now. Future: only install extensions not bundled
+        // or previously installed.
+    }
+
     private void CreateZipImage()
     {
         _context.CleanDirectory(BuildSettings.ZipImageDirectory);
@@ -58,10 +65,6 @@ public class ZipPackage : PackageDefinition
             BuildSettings.OutputDirectory,
             BuildSettings.ZipImageDirectory + "bin/" );
 
-        _context.CopyFileToDirectory(
-            BuildSettings.ZipDirectory + "nunit.bundle.addins",
-            BuildSettings.ZipImageDirectory);
-
         var addinsDir = BuildSettings.ZipImageDirectory + "bin/net462/addins/";
         _context.CreateDirectory(addinsDir);