diff --git a/Microsoft.Research/RegressionTest/ClousotTestHarness/Properties/AssemblyInfo.cs b/Microsoft.Research/RegressionTest/ClousotTestHarness/Properties/AssemblyInfo.cs index 53a1bb9f..3cc0f89d 100644 --- a/Microsoft.Research/RegressionTest/ClousotTestHarness/Properties/AssemblyInfo.cs +++ b/Microsoft.Research/RegressionTest/ClousotTestHarness/Properties/AssemblyInfo.cs @@ -1,16 +1,5 @@ -// CodeContracts -// -// Copyright (c) Microsoft Corporation -// -// All rights reserved. -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; using System.Runtime.CompilerServices; @@ -24,7 +13,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Microsoft IT")] [assembly: AssemblyProduct("ClousotTestHarness")] -[assembly: AssemblyCopyright("Copyright © Microsoft IT 2010")] +[assembly: AssemblyCopyright("Copyright \u00A9 Microsoft IT 2010")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Microsoft.Research/RegressionTest/ClousotTestHarness/TestHarness.cs b/Microsoft.Research/RegressionTest/ClousotTestHarness/TestHarness.cs index 8e6d8cce..ca1502bd 100644 --- a/Microsoft.Research/RegressionTest/ClousotTestHarness/TestHarness.cs +++ b/Microsoft.Research/RegressionTest/ClousotTestHarness/TestHarness.cs @@ -1,97 +1,82 @@ -// CodeContracts -// -// Copyright (c) Microsoft Corporation -// -// All rights reserved. -// -// MIT License -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// Copyright (c) Microsoft. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. using System; using System.Collections.Generic; using System.Text; using Microsoft.Research.ClousotRegression; - namespace Microsoft.Research.ClousotRegression { - public enum ProofOutcome { Top = 0, Bottom, True, False } + public enum ProofOutcome { Top = 0, Bottom, True, False } - [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] - public class ClousotRegressionTestAttribute : Attribute - { - /// - /// Default, valid for all configurations - /// - public ClousotRegressionTestAttribute() + [AttributeUsage(AttributeTargets.All, AllowMultiple = true)] + public class ClousotRegressionTestAttribute : Attribute { + /// + /// Default, valid for all configurations + /// + public ClousotRegressionTestAttribute() + { + } + + /// + /// Valid when conditional symbol is defined for regression run + /// + public ClousotRegressionTestAttribute(string conditionalSymbol) + { + } } - /// - /// Valid when conditional symbol is defined for regression run - /// - public ClousotRegressionTestAttribute(string conditionalSymbol) + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)] + public class RegressionOutcomeAttribute : Attribute { - } - } + /// What outcome the proof obligation has + public ProofOutcome Outcome { get; set; } + /// The associated message + public string Message { get; set; } + /// The primary PC IL offset + public int PrimaryILOffset { get; set; } + /// The IL offset within this method + public int MethodILOffset { get; set; } - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)] - public class RegressionOutcomeAttribute : Attribute - { - /// What outcome the proof obligation has - public ProofOutcome Outcome { get; set; } - /// The associated message - public string Message { get; set; } - /// The primary PC IL offset - public int PrimaryILOffset { get; set; } - /// The IL offset within this method - public int MethodILOffset { get; set; } + /// + /// Stores outcomes on a method. + /// + public RegressionOutcomeAttribute() + { + } - /// - /// Stores outcomes on a method. - /// - public RegressionOutcomeAttribute() - { + /// + /// Stores global error outcomes on assembly + /// + /// + public RegressionOutcomeAttribute(string expectedMessage) + { + } } - /// - /// Stores global error outcomes on assembly - /// - /// - public RegressionOutcomeAttribute(string expectedMessage) + [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)] + public class RegressionReanalysisCountAttribute : Attribute { - } - - } + public int Count { get; set; } - [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Method | AttributeTargets.Constructor, AllowMultiple = true)] - public class RegressionReanalysisCountAttribute : Attribute - { + /// + /// Stores outcomes on a method. + /// + public RegressionReanalysisCountAttribute() + { + this.Count = 0; + } - public int Count { get; set; } - - /// - /// Stores outcomes on a method. - /// - public RegressionReanalysisCountAttribute() - { - this.Count = 0; + /// + /// Stores global error outcomes on assembly + /// + /// + public RegressionReanalysisCountAttribute(int count) + { + this.Count = count; + } } - - /// - /// Stores global error outcomes on assembly - /// - /// - public RegressionReanalysisCountAttribute(int count) - { - this.Count = count; - } - - } }