summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung Yoon Whang <suwhang@microsoft.com>2018-04-09 12:15:15 -0700
committerGitHub <noreply@github.com>2018-04-09 12:15:15 -0700
commita788a72d5ac56ceb8285d14c87f9ccddc229be34 (patch)
tree0e3d1d8fee6ef92305616362595c9edf2e7b1afb
parent1d9b711b5f15de65f580924368d53e0bbe2ca8b7 (diff)
downloadcoreclr-a788a72d5ac56ceb8285d14c87f9ccddc229be34.tar.gz
coreclr-a788a72d5ac56ceb8285d14c87f9ccddc229be34.tar.bz2
coreclr-a788a72d5ac56ceb8285d14c87f9ccddc229be34.zip
Reverting changes from #17401 (#17482)
-rw-r--r--tests/src/Common/test_dependencies/test_dependencies.csproj3
-rw-r--r--tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.cs135
-rw-r--r--tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj39
-rw-r--r--tests/testsUnsupportedOutsideWindows.txt1
4 files changed, 0 insertions, 178 deletions
diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
index 6337491655..8945355364 100644
--- a/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -25,9 +25,6 @@
<PackageReference Include="System.Runtime.Intrinsics.Experimental">
<Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
</PackageReference>
- <PackageReference Include="System.Diagnostics.EventLog">
- <Version>$(MicrosoftPrivateCoreFxNETCoreAppPackageVersion)</Version>
- </PackageReference>
</ItemGroup>
<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
diff --git a/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.cs b/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.cs
deleted file mode 100644
index ac37e5a9f3..0000000000
--- a/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.cs
+++ /dev/null
@@ -1,135 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Threading;
-
-class Program
-{
- private static void UnhandledException()
- {
- A();
- }
-
- private static void FailFast()
- {
- try
- {
- A();
- }
- catch (ArgumentException ex)
- {
- Environment.FailFast("failing fast", ex);
- }
-
- }
-
- private static void A()
- {
- B();
- }
-
- private static void B()
- {
- throw new ArgumentException("my ae");
- }
-
- private static bool LaunchTest(string testName, string[] logEntriesToCheck)
- {
- DateTime dt = DateTime.Now;
-
- Process testProcess = new Process();
- string currentPath = Directory.GetCurrentDirectory();
- string corerunPath = Environment.GetEnvironmentVariable("CORE_ROOT") + "\\corerun.exe";
-
- testProcess.StartInfo.FileName = corerunPath;
- testProcess.StartInfo.Arguments = currentPath + "\\WindowsEventLog.exe " + testName;
- testProcess.StartInfo.EnvironmentVariables["CORE_ROOT"] = Environment.GetEnvironmentVariable("CORE_ROOT");
- testProcess.StartInfo.UseShellExecute = false;
-
- testProcess.Start();
- testProcess.WaitForExit();
-
- Thread.Sleep(2000);
-
- EventLog log = new EventLog("Application");
-
- foreach (EventLogEntry entry in log.Entries)
- {
- int checkCount = 0;
- if (entry.TimeGenerated > dt)
- {
- String source = entry.Source;
- String message = entry.Message;
-
- foreach (string logEntry in logEntriesToCheck)
- {
- Console.WriteLine("Checking for existence of : " + logEntry);
- if (message.Contains(logEntry))
- checkCount += 1;
- else
- Console.WriteLine("Couldn't find it in: " + message);
- }
-
- if (source.Contains(".NET Runtime") && checkCount == logEntriesToCheck.Length)
- return true;
- else if (source.Contains(".NET Runtime"))
- {
- Console.WriteLine("*** Event Log ***");
- Console.WriteLine(message);
- }
- }
- }
- return false;
- }
-
- private static bool RunUnhandledExceptionTest()
- {
- string[] logEntriesToCheck = {"unhandled exception", "my ae", "ArgumentException"};
- return LaunchTest("UnhandledException", logEntriesToCheck);
- }
-
- private static bool RunFailFastTest()
- {
- string[] logEntriesToCheck = {"The application requested process termination through System.Environment.FailFast(string message).", "failing fast", "ArgumentException"};
- return LaunchTest("FailFast", logEntriesToCheck);
- }
-
-
- public static int Main(string[] args)
- {
- if (args.Length == 0) // When invoked with no args, launch itself with appropriate args to cause various exceptions
- {
- if (!System.Runtime.InteropServices.RuntimeInformation.OSDescription.Contains("Windows"))
- {
- return 100;
- }
-
- if (!RunUnhandledExceptionTest())
- {
- Console.WriteLine("WindowsEventLog Test: UnhandledExceptionTest failed.");
- return 1;
- }
-
- if (!RunFailFastTest())
- {
- Console.WriteLine("WindowsEventLog Test: FailFastTest failed.");
- return 1;
- }
-
- return 100;
- }
-
- Debug.Assert(args.Length == 1);
-
- if (args[0] == "UnhandledException")
- {
- UnhandledException();
- }
- else if (args[0] == "FailFast")
- {
- FailFast();
- }
-
- return 100; // Should never reach here
- }
-}
diff --git a/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj b/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
deleted file mode 100644
index ef03066a21..0000000000
--- a/tests/src/baseservices/exceptions/WindowsEventLog/WindowsEventLog.csproj
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <AssemblyName>WindowsEventLog</AssemblyName>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
- <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-
- <DefineConstants>$(DefineConstants);STATIC</DefineConstants>
- </PropertyGroup>
- <!-- Default configurations to help VS understand the configurations -->
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
- </PropertyGroup>
- <PropertyGroup>
- <DisableProjectBuild Condition="'$(TargetsUnix)' == 'true'">true</DisableProjectBuild>
- </PropertyGroup>
- <ItemGroup>
- <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
- <Visible>False</Visible>
- </CodeAnalysisDependentAssemblyPaths>
- </ItemGroup>
- <ItemGroup>
- <PackageReference Include="System.Diagnostics.EventLog" Version="4.5.0-preview1-26216-02" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="WindowsEventLog.cs" />
- </ItemGroup>
- <ItemGroup>
- <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
- </ItemGroup>
- <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
diff --git a/tests/testsUnsupportedOutsideWindows.txt b/tests/testsUnsupportedOutsideWindows.txt
index d80a038056..fa7489e1a1 100644
--- a/tests/testsUnsupportedOutsideWindows.txt
+++ b/tests/testsUnsupportedOutsideWindows.txt
@@ -1,6 +1,5 @@
baseservices/exceptions/regressions/Dev11/147911/test147911/test147911.sh
baseservices/exceptions/regressions/V1/SEH/VJ/UnmanagedToManaged/UnmanagedToManaged.sh
-baseservices/exceptions/WindowsEventLog/WindowsEventLog.sh
baseservices/threading/commitstackonlyasneeded/DefaultStackCommit/DefaultStackCommit.sh
baseservices/threading/interlocked/compareexchange/compareexchangetneg/compareexchangetneg.sh
baseservices/threading/monitor/pulse/monitorpulse02/monitorpulse02.sh