From e8eae64425a7d97f4c6d6eacd70dbca48732fbfa Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Thu, 11 Jun 2020 14:17:50 -0500 Subject: [PATCH] Add DebugMode parameter --- .../Cosmos.TestRunner.Core/Engine.Helpers.cs | 2 +- Tests/Cosmos.TestRunner.Core/Engine.cs | 1 + .../IEngineConfiguration.cs | 1 + .../DefaultEngineConfiguration.cs | 1 + .../EngineConfiguration.cs | 1 + Tests/Cosmos.TestRunner/.vscode/launch.json | 25 ----------- Tests/Cosmos.TestRunner/.vscode/tasks.json | 42 ------------------- 7 files changed, 5 insertions(+), 68 deletions(-) delete mode 100644 Tests/Cosmos.TestRunner/.vscode/launch.json delete mode 100644 Tests/Cosmos.TestRunner/.vscode/tasks.json diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs index 4a74a7df1..37e52b1ab 100644 --- a/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs +++ b/Tests/Cosmos.TestRunner.Core/Engine.Helpers.cs @@ -216,7 +216,7 @@ namespace Cosmos.TestRunner.Core "EnableDebug:True", "EnableStackCorruptionDetection:" + EnableStackCorruptionChecks, "StackCorruptionDetectionLevel:" + StackCorruptionDetectionLevel, - "DebugMode:Source", + "DebugMode:" + DebugMode, "TraceAssemblies:" + TraceAssembliesLevel, "DebugCom:1", "TargetAssembly:" + kernelFileName, diff --git a/Tests/Cosmos.TestRunner.Core/Engine.cs b/Tests/Cosmos.TestRunner.Core/Engine.cs index 815c6ec04..911e0fc89 100644 --- a/Tests/Cosmos.TestRunner.Core/Engine.cs +++ b/Tests/Cosmos.TestRunner.Core/Engine.cs @@ -19,6 +19,7 @@ namespace Cosmos.TestRunner.Core protected TraceAssemblies TraceAssembliesLevel => mConfiguration.TraceAssembliesLevel; protected bool EnableStackCorruptionChecks => mConfiguration.EnableStackCorruptionChecks; protected StackCorruptionDetectionLevel StackCorruptionDetectionLevel => mConfiguration.StackCorruptionDetectionLevel; + protected DebugMode DebugMode => mConfiguration.DebugMode; protected bool RunWithGDB => mConfiguration.RunWithGDB; protected bool StartBochsDebugGui => mConfiguration.StartBochsDebugGUI; diff --git a/Tests/Cosmos.TestRunner.Core/IEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Core/IEngineConfiguration.cs index 050283bb4..ca4ad8ddd 100644 --- a/Tests/Cosmos.TestRunner.Core/IEngineConfiguration.cs +++ b/Tests/Cosmos.TestRunner.Core/IEngineConfiguration.cs @@ -28,6 +28,7 @@ namespace Cosmos.TestRunner.Core TraceAssemblies TraceAssembliesLevel { get; } bool EnableStackCorruptionChecks { get; } StackCorruptionDetectionLevel StackCorruptionDetectionLevel { get; } + DebugMode DebugMode { get; } /// /// An enumerable of kernel assemblies which will be run. diff --git a/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs b/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs index 34eac84ed..09ffe9ab6 100644 --- a/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs +++ b/Tests/Cosmos.TestRunner.Full/DefaultEngineConfiguration.cs @@ -28,6 +28,7 @@ namespace Cosmos.TestRunner.Full public virtual TraceAssemblies TraceAssembliesLevel => TraceAssemblies.User; public virtual bool EnableStackCorruptionChecks => true; public virtual StackCorruptionDetectionLevel StackCorruptionDetectionLevel => StackCorruptionDetectionLevel.AllInstructions; + public virtual DebugMode DebugMode => DebugMode.Source; public virtual IEnumerable KernelAssembliesToRun { diff --git a/Tests/Cosmos.TestRunner.TestAdapter/EngineConfiguration.cs b/Tests/Cosmos.TestRunner.TestAdapter/EngineConfiguration.cs index 31cfceff6..4d01c3763 100644 --- a/Tests/Cosmos.TestRunner.TestAdapter/EngineConfiguration.cs +++ b/Tests/Cosmos.TestRunner.TestAdapter/EngineConfiguration.cs @@ -20,6 +20,7 @@ namespace Cosmos.TestRunner.TestAdapter public TraceAssemblies TraceAssembliesLevel { get; } public bool EnableStackCorruptionChecks { get; } public StackCorruptionDetectionLevel StackCorruptionDetectionLevel { get; } + public DebugMode DebugMode { get; } public IEnumerable KernelAssembliesToRun { get; } diff --git a/Tests/Cosmos.TestRunner/.vscode/launch.json b/Tests/Cosmos.TestRunner/.vscode/launch.json deleted file mode 100644 index b1e73178b..000000000 --- a/Tests/Cosmos.TestRunner/.vscode/launch.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - // Use IntelliSense to learn about possible attributes. - // Hover to view descriptions of existing attributes. - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": ".NET Core Launch (console)", - "type": "coreclr", - "request": "launch", - "preLaunchTask": "build", - "program": "${workspaceFolder}/bin/Debug/netcoreapp2.0/Cosmos.TestRunner.dll", - "args": [], - "cwd": "${workspaceFolder}", - "console": "internalConsole", - "stopAtEntry": false - }, - { - "name": ".NET Core Attach", - "type": "coreclr", - "request": "attach", - "processId": "${command:pickProcess}" - } - ] -} \ No newline at end of file diff --git a/Tests/Cosmos.TestRunner/.vscode/tasks.json b/Tests/Cosmos.TestRunner/.vscode/tasks.json deleted file mode 100644 index bd652ecd7..000000000 --- a/Tests/Cosmos.TestRunner/.vscode/tasks.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "2.0.0", - "tasks": [ - { - "label": "build", - "command": "dotnet", - "type": "process", - "args": [ - "build", - "${workspaceFolder}/Cosmos.TestRunner.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "publish", - "command": "dotnet", - "type": "process", - "args": [ - "publish", - "${workspaceFolder}/Cosmos.TestRunner.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - }, - { - "label": "watch", - "command": "dotnet", - "type": "process", - "args": [ - "watch", - "run", - "${workspaceFolder}/Cosmos.TestRunner.csproj", - "/property:GenerateFullPaths=true", - "/consoleloggerparameters:NoSummary" - ], - "problemMatcher": "$msCompile" - } - ] -} \ No newline at end of file