Fix two "missing DLL" test failures

Fix dotnet/coreclr#2234 Missing native DLL
Fix dotnet/coreclr#2237 Missing DLL is a MC++ test hiding alongside a C# wrapper--delete
    test which was mistakenly ported.

Commit migrated from https://github.com/dotnet/coreclr/commit/7c4c8f3efc6e9acdbd1aa972b10b00ea11b63c27

diff --git a/src/coreclr/tests/issues.targets b/src/coreclr/tests/issues.targets
index 03545dc..9b17129 100644 (file)
--- a/src/coreclr/tests/issues.targets
+++ b/src/coreclr/tests/issues.targets
@@ -25,18 +25,12 @@
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1-M12-Beta2\b57367\b57367\*" >
             <Issue>2235</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b101136\b101136\*" >
-            <Issue>2237</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M02\b20785\b20785\*" >
             <Issue>2235</Issue>
         </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V2.0-Beta2\b399444\b399444a\*" >
             <Issue>2235</Issue>
         </ExcludeList>
-        <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-M02\b108129\b108129\*" >
-            <Issue>2234</Issue>
-        </ExcludeList>
         <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Tailcall\TailcallVerifyWithPrefix\TailcallVerifyWithPrefix.cmd" >
              <Issue>2329</Issue>
         </ExcludeList>

diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/SlurpStdout.cs b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/SlurpStdout.cs
deleted file mode 100644 (file)
index 5d8c7ec..0000000
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/SlurpStdout.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using System;
-using System.Diagnostics;
-
-public class SlurpStdout
-{
-    public static string expSTDOUT = "test = hello world!";
-
-    public static int Main()
-    {
-        Process p;
-        string strSTDOUT;
-
-        p = new Process();
-        p.StartInfo.FileName = "StringBugNewSyntax.exe";
-        p.StartInfo.UseShellExecute = false;
-        p.StartInfo.RedirectStandardOutput = true;
-        p.StartInfo.Arguments = null;
-        p.Start();
-        p.WaitForExit();
-
-        strSTDOUT = p.StandardOutput.ReadToEnd();
-
-        strSTDOUT = strSTDOUT.Trim();
-
-        if (strSTDOUT.StartsWith(expSTDOUT) && strSTDOUT.EndsWith(expSTDOUT))
-        {
-            Console.WriteLine("Pass");
-            return 100;
-        }
-        else
-        {
-            Console.WriteLine("Received         : [{0}]", strSTDOUT);
-            Console.WriteLine("Expected Begining: [{0}]", expSTDOUT);
-            Console.WriteLine("Expected End     : [{0}]", expSTDOUT);
-            Console.WriteLine("FAIL");
-            return 0;
-        }
-    }
-}
-
-

diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/app.config b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/app.config
deleted file mode 100644 (file)
index 6f7bbd9..0000000
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/app.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.20.0" newVersion="4.0.20.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Text.Encoding" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.IO" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Reflection" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.10.0" newVersion="4.0.10.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/b101136.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/b101136.csproj
deleted file mode 100644 (file)
index 2d3ecff..0000000
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/b101136.csproj
+++ /dev/null
@@ -1,53 +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>$(MSBuildProjectName)</AssemblyName>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{95DFC527-4DC1-495E-97D7-E94EE1F7140D}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT  .0\UITestExtensionPackages</ReferencePath>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
-    <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
-  </PropertyGroup>
-  <!-- Default configurations to help VS understand the configurations -->
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-  </PropertyGroup>
-  <ItemGroup>
-    <CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
-      <Visible>False</Visible>
-    </CodeAnalysisDependentAssemblyPaths>
-  </ItemGroup>
-  <PropertyGroup>
-    <!-- Set to 'Full' if the Debug? column is marked in the spreadsheet. Leave blank otherwise. -->
-    <DebugType>PdbOnly</DebugType>
-    <NoLogo>True</NoLogo>
-    <NoStandardLib>True</NoStandardLib>
-    <Noconfig>True</Noconfig>
-    <DefineConstants>$(DefineConstants);DESKTOP</DefineConstants>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="SlurpStdout.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="$(JitPackagesConfigFileDirectory)extra\project.json" />
-    <None Include="app.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
-  </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
-  </PropertyGroup> 
-</Project>

diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt
new file mode 100644 (file)
index 0000000..7fddee3
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 2.6)
+project(b108129_test2)
+include_directories(${INC_PLATFORM_DIR})
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
+
+add_library(test2 SHARED test2.cpp)
+SET_TARGET_PROPERTIES(test2 PROPERTIES COMPILE_FLAGS "-c") 
+
+# add the install targets (this "installs" the native file on Windows systems)
+install(TARGETS test2 DESTINATION bin)
+
+# This "installs" the native file on System V systems
+set_target_properties(test2 PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/test2)

diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
index bcddc66..dac596d 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
@@ -43,6 +43,9 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="CMakeLists.txt" />
+  </ItemGroup>
   <PropertyGroup>
     <ProjectJson>$(JitPackagesConfigFileDirectory)extra\project.json</ProjectJson>
     <ProjectLockJson>$(JitPackagesConfigFileDirectory)extra\project.lock.json</ProjectLockJson>

diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cpp b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cpp
new file mode 100644 (file)
index 0000000..c98dda6
--- /dev/null
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cpp
@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+#include <platformdefines.h>
+
+extern "C"
+{
+DLL_EXPORT int GetInt32Const() {return 7;}
+DLL_EXPORT __int64 GetInt64Const() {return 7;}
+DLL_EXPORT float GetFloatConst() {return 7.777777f;}
+DLL_EXPORT double GetDoubleConst() {return 7.777777;}
+}

diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cs b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cs
index afd9945..071f973 100644 (file)
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cs
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/test2.cs
@@ -8,16 +8,16 @@ namespace JitTest.HFA
 {
     public class TestCase
     {
-        [DllImport("test2.dll", EntryPoint = "GetInt32Const")]
+        [DllImport("test2", EntryPoint = "GetInt32Const")]
         public static extern int GetInt32Const();
 
-        [DllImport("test2.dll", EntryPoint = "GetInt64Const")]
+        [DllImport("test2", EntryPoint = "GetInt64Const")]
         public static extern long GetInt64Const();
 
-        [DllImport("test2.dll", EntryPoint = "GetFloatConst")]
+        [DllImport("test2", EntryPoint = "GetFloatConst")]
         public static extern float GetFloatConst();
 
-        [DllImport("test2.dll", EntryPoint = "GetDoubleConst")]
+        [DllImport("test2", EntryPoint = "GetDoubleConst")]
         public static extern double GetDoubleConst();
 
         private static int Main()

diff --git a/src/coreclr/tests/testsFailingOutsideWindows.txt b/src/coreclr/tests/testsFailingOutsideWindows.txt
index 1156141..127f6f3 100644 (file)
--- a/src/coreclr/tests/testsFailingOutsideWindows.txt
+++ b/src/coreclr/tests/testsFailingOutsideWindows.txt
@@ -47,12 +47,10 @@ JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b57367/b57367/b57367.sh
 JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533/b66533.sh
 JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793/b88793.sh
 JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248/b91248.sh
-JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b101136/b101136/b101136.sh
 JIT/Regression/CLR-x86-JIT/V1.2-M02/b20785/b20785/b20785.sh
 JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a/b399444a.sh
 JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b409748/b409748/b409748.sh
 JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509/b302509.sh
-JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129/b108129.sh
 JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011/b12011.sh
 JIT/opt/Tailcall/TailcallVerifyWithPrefix/TailcallVerifyWithPrefix.sh
 Loader/NativeLibs/FromNativePaths/FromNativePaths.sh

diff --git a/src/coreclr/tests/x86_legacy_backend_issues.targets b/src/coreclr/tests/x86_legacy_backend_issues.targets
index bcfa557..2328701 100644 (file)
--- a/src/coreclr/tests/x86_legacy_backend_issues.targets
+++ b/src/coreclr/tests/x86_legacy_backend_issues.targets
@@ -157,9 +157,6 @@
     <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-M01\b08046\b08046\b08046.cmd">
       <Issue>needs triage</Issue>
     </ExcludeList>
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\CLR-x86-JIT\V1.2-Beta1\b101136\b101136\b101136.cmd">
-      <Issue>needs triage</Issue>
-    </ExcludeList>
     <ExcludeList Include="$(XunitTestBinBase)\JIT\Directed\intrinsic\interlocked\rva_rvastatic3\rva_rvastatic3.cmd Timed Out">
       <Issue>needs triage</Issue>
     </ExcludeList>
@@ -232,9 +229,6 @@
     <ExcludeList Include="$(XunitTestBinBase)\JIT\opt\Inline\regression\mismatch32\mismatch32\mismatch32.cmd">
       <Issue>needs triage</Issue>
     </ExcludeList>
-    <ExcludeList Include="$(XunitTestBinBase)\JIT\Regression\VS-ia64-JIT\V1.2-M02\b108129\b108129\b108129.cmd">
-      <Issue>needs triage</Issue>
-    </ExcludeList>
     <ExcludeList Include="$(XunitTestBinBase)\JIT\SIMD\CircleInConvex_ro\CircleInConvex_ro.cmd">
       <Issue>needs triage</Issue>
     </ExcludeList>