From 54b1f7e19fc14c7ec2e5995d6d8ecc26d2d79de7 Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Sat, 18 Jun 2016 21:21:43 -0500 Subject: [PATCH 1/3] Fixed test runner result. --- Tests/Cosmos.TestRunner.Core/Engine.Running.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Tests/Cosmos.TestRunner.Core/Engine.Running.cs b/Tests/Cosmos.TestRunner.Core/Engine.Running.cs index 878fd6393..94c49814f 100644 --- a/Tests/Cosmos.TestRunner.Core/Engine.Running.cs +++ b/Tests/Cosmos.TestRunner.Core/Engine.Running.cs @@ -55,9 +55,7 @@ namespace Cosmos.TestRunner.Core debugConnector.CmdNullReferenceOccurred = a => { OutputHandler.LogMessage("Null Reference Exception occurred at: 0x" + a.ToString("X8")); - OutputHandler.SetKernelTestResult( - false, - "Null Reference Exception occurred at: 0x" + a.ToString("X8")); + OutputHandler.SetKernelTestResult(false, "Null Reference Exception occurred at: 0x" + a.ToString("X8")); mKernelResultSet = true; mKernelRunning = false; }; @@ -100,7 +98,7 @@ namespace Cosmos.TestRunner.Core break; } } - if (!mKernelResultSet) + if (mKernelResultSet) { OutputHandler.SetKernelTestResult(true, null); } From 8f57c22fc81488bf202eccff8a3fc38c09e3116f Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Sun, 19 Jun 2016 02:20:51 -0500 Subject: [PATCH 2/3] Minor build changes --- .../Desktop/FrotzBase/FrotzNetDLL.csproj | 18 +++++++++++++++++ .../FrotzKernel/FrotzKernel.csproj | 4 ++++ .../Frotz.Net/source/zConsole/zConsole.csproj | 20 +++++++++++++++++++ source/Cosmos.sln | 16 +++++++-------- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj b/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj index 891228576..56feeed40 100644 --- a/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj +++ b/Demos/zMachine/Frotz.Net/source/Desktop/FrotzBase/FrotzNetDLL.csproj @@ -35,6 +35,24 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + diff --git a/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj b/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj index 4299c2f07..368ad1f63 100644 --- a/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj +++ b/Demos/zMachine/Frotz.Net/source/FrotzKernel/FrotzKernel/FrotzKernel/FrotzKernel.csproj @@ -50,6 +50,10 @@ {3def0461-08ab-471a-8f03-a9c556652a0f} Cosmos.System + + {a843c6b0-cff3-4a69-87bc-c93608235e47} + FrotzNetDLL + {3e4a8079-aac0-429d-b042-0b5151e0e5be} zConsole diff --git a/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj b/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj index 86b1a160f..8f564153e 100644 --- a/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj +++ b/Demos/zMachine/Frotz.Net/source/zConsole/zConsole.csproj @@ -32,6 +32,26 @@ prompt 4 + + true + bin\x86\Debug\ + DEBUG;TRACE + full + x86 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x86\Release\ + TRACE + true + pdbonly + x86 + prompt + MinimumRecommendedRules.ruleset + true + diff --git a/source/Cosmos.sln b/source/Cosmos.sln index 393cc1912..2a2132249 100644 --- a/source/Cosmos.sln +++ b/source/Cosmos.sln @@ -1467,8 +1467,8 @@ Global {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|Mixed Platforms.Build.0 = Debug|x86 {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.ActiveCfg = Debug|Any CPU {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x64.Build.0 = Debug|Any CPU - {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.ActiveCfg = Debug|Any CPU - {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.Build.0 = Debug|Any CPU + {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.ActiveCfg = Debug|x86 + {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Debug|x86.Build.0 = Debug|x86 {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Any CPU.ActiveCfg = Release|Any CPU {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Any CPU.Build.0 = Release|Any CPU {901EA2C4-5E9C-44E8-B6D2-3B23DEE6D61B}.Release|Mixed Platforms.ActiveCfg = Release|x86 @@ -1483,8 +1483,8 @@ Global {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|Mixed Platforms.Build.0 = Debug|x86 {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.ActiveCfg = Debug|Any CPU {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x64.Build.0 = Debug|Any CPU - {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.ActiveCfg = Debug|Any CPU - {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.Build.0 = Debug|Any CPU + {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.ActiveCfg = Debug|x86 + {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Debug|x86.Build.0 = Debug|x86 {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Any CPU.ActiveCfg = Release|Any CPU {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Any CPU.Build.0 = Release|Any CPU {84BFA6F0-D518-4D22-BDCF-E07DF3C0E678}.Release|Mixed Platforms.ActiveCfg = Release|x86 @@ -1525,8 +1525,8 @@ Global {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x64.ActiveCfg = Debug|Any CPU {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x64.Build.0 = Debug|Any CPU - {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.ActiveCfg = Debug|Any CPU - {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.Build.0 = Debug|Any CPU + {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.ActiveCfg = Debug|x86 + {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Debug|x86.Build.0 = Debug|x86 {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Any CPU.ActiveCfg = Release|Any CPU {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Any CPU.Build.0 = Release|Any CPU {A843C6B0-CFF3-4A69-87BC-C93608235E47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU @@ -1540,8 +1540,8 @@ Global {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x64.ActiveCfg = Debug|Any CPU {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x64.Build.0 = Debug|Any CPU - {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.ActiveCfg = Debug|Any CPU - {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.Build.0 = Debug|Any CPU + {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.ActiveCfg = Debug|x86 + {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Debug|x86.Build.0 = Debug|x86 {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Any CPU.Build.0 = Release|Any CPU {3E4A8079-AAC0-429D-B042-0B5151E0E5BE}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU From 19672c5be5bbdd85355405f94adb3ce595ba9e42 Mon Sep 17 00:00:00 2001 From: Charles Betros Date: Sun, 19 Jun 2016 06:14:30 -0500 Subject: [PATCH 3/3] Fix project reference. --- ...osmos.Compiler.Tests.EncryptionBoot.Cosmos | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos index 3ea7d809f..a17a2a7fd 100644 --- a/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos +++ b/Tests/Cosmos.Compiler.Tests.Encryption/Cosmos.Compiler.Tests.EncryptionBoot.Cosmos @@ -1,4 +1,4 @@ - + Debug @@ -26,15 +26,16 @@ Pipe: Cosmos\Serial - - Cosmos.Compiler.Tests.Encryption - {48ebdeb2-6a6a-4df2-b5f1-db6d299401f2} - + + + - - - + + Cosmos.Compiler.Tests.Encryption + {48ebdeb2-6a6a-4df2-b5f1-db6d299401f2} + True + - + \ No newline at end of file