Merge branch 'master' into Skyline/work/20250207_ReduceMemoryFootprint

ProteoWizard · Feb 27, 2025 · 089aa1f · 089aa1f
2 parents ea051ce + ff3d22e
commit 089aa1f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/pwiz_tools/Skyline/Alerts/AlertDlg.cs b/pwiz_tools/Skyline/Alerts/AlertDlg.cs
@@ -96,5 +96,9 @@ protected override void OnLoad(EventArgs e)
             base.OnLoad(e);
             GetModeUIHelper().OnLoad(this);
         }
+        public override void CopyMessage()
+        {
+            ClipboardHelper.SetSystemClipboardText(this, GetTitleAndMessageDetail());
+        }
     }
 }
diff --git a/pwiz_tools/Skyline/SkylineTester/TabTests.cs b/pwiz_tools/Skyline/SkylineTester/TabTests.cs
@@ -107,7 +107,8 @@ public override bool Run()
             if (GetTestList().Length > 0)
                 args.Append(" perftests=on"); // In case any perf tests were explicitly selected - no harm if they weren't
 
-            if (MainWindow.RunParallel.Checked && GetTestCount() > 1) // No need for parallel on a single test
+            if (MainWindow.RunParallel.Checked &&
+                GetTestCount()*cultures.Count > 1) // No need to fire up parallel nodes on a single test in single culture
             {
                 // CONSIDER: Should we add a checkbox for this?
                 // args.Append(" keepworkerlogs=1"); // For debugging startup issues. Look for TestRunner-docker-worker_#-docker.log files in pwiz root

diff --git a/pwiz_tools/Skyline/TestRunner/Program.cs b/pwiz_tools/Skyline/TestRunner/Program.cs
@@ -1582,8 +1582,9 @@ private static bool RunTestPasses(
                         if (testList.Any(t => t.DoNotLeakTest))
                         {
                             // These are  too lengthy to run multiple times for leak testing, so not a good fit for pass 1
-                            // But it's a shame to skip them entirely, so we'll run one of them in pass 1 each day
+                            // But it's a shame to skip them entirely, so we flip the attribute so they run on perf test machines
                             runTests.Log("# Tests with NoLeakTesting attribute are skipped in pass 1 but prioritized in pass 2.\r\n");
+                            runTests.Log("# Note that systems running perf tests invert the NoLeakTesting attribute to ensure overall coverage.\r\n");
                         }
                         if (testList.Any(t => t.IsPerfTest))
                         {
@@ -1780,7 +1781,8 @@ private static bool RunTestPasses(
                                     }
                                     break;
                                 }
-                                if (!runTests.Run(test, pass, testNumber, dmpDir, false))
+                                if (!runTests.Run(test, pass, testNumber, dmpDir, false) || // Test failed, don't rerun
+                                    RunOnceTestNames.Contains(test.TestMethod.Name)) // No point in running certain tests more than once
                                 {
                                     removeList.Add(test);
                                     i = languages.Length - 1;   // Don't run other languages.

diff --git a/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs b/pwiz_tools/Skyline/TestUtil/PauseAndContinueForm.cs
@@ -111,11 +111,13 @@ private void ShowInternal(string description, int screenshotNum = 0, int? timeou
             // Testing will have UseKeysOverride set to true to prevent accidental
             // keyboard interaction with the running test.
             RunUI(Program.MainWindow, () => Program.MainWindow.UseKeysOverride = false);
+            ClipboardEx.UseInternalClipboard(false);
             lock (_pauseLock)
             {
                 RunUI(_ownerForm, RefreshAndShow);
                 Monitor.Wait(_pauseLock, timeout ?? -1);
             }
+            ClipboardEx.UseInternalClipboard();
             RunUI(Program.MainWindow, () => Program.MainWindow.UseKeysOverride = true);
 
             // Record that the screenshot happened in the console output to make