Disable ExecuteInDefaultAppDomain test on *nix
authorSteve MacLean <Steve.MacLean@microsoft.com>
Tue, 23 Oct 2018 17:29:16 +0000 (13:29 -0400)
committerSteve MacLean <stmaclea@microsoft.com>
Thu, 25 Oct 2018 17:21:48 +0000 (13:21 -0400)
Commit migrated from https://github.com/dotnet/coreclr/commit/f3772edae65f2d1c7ac2e32df700dce5bb5c5408

src/coreclr/tests/issues.targets
src/coreclr/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp
src/coreclr/tests/testsUnsupportedOutsideWindows.txt

index 2debfda..ff7da65 100644 (file)
@@ -70,6 +70,9 @@
         <ExcludeList Include="$(XunitTestBinBase)/JIT/Directed/arglist/vararg/*">
             <Issue>Native varargs not supported on unix</Issue>
         </ExcludeList>
+        <ExcludeList Include="$(XunitTestBinBase)/Interop/ExecInDefAppDom/ExecInDefAppDom/*">
+            <Issue>Issue building native components for the test.</Issue>
+        </ExcludeList>
     </ItemGroup>
 
     <!-- Arm32 All OS -->
index cd83137..597c248 100644 (file)
@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 
 #include <xplatform.h>
+
+#ifdef WINDOWS
 #include "mscoree.h"
 
 typedef HRESULT  (STDAPICALLTYPE *FnGetCLRRuntimeHost)(REFIID riid, IUnknown **pUnk);
@@ -60,3 +62,23 @@ CallExecuteInDefaultAppDomain(LPCWSTR pwzAssemblyPath,
 
     return result;
 }
+
+#else // WINDOWS
+
+#include <cstdint>
+
+typedef uint32_t DWORD;
+
+extern "C" DLL_EXPORT int STDMETHODCALLTYPE
+CallExecuteInDefaultAppDomain(LPCWSTR pwzAssemblyPath,
+                        LPCWSTR pwzTypeName,
+                        LPCWSTR pwzMethodName,
+                        LPCWSTR pwzArgument,
+                        DWORD   *pReturnValue)
+{
+    const int E_FAIL = 0x80004005;
+
+    return E_FAIL;
+}
+
+#endif // WINDOWS
\ No newline at end of file
index 2f4365f..70a8883 100644 (file)
@@ -123,6 +123,7 @@ CoreMangLib/cti/system/reflection/emit/DynMethodJumpStubTests/DynMethodJumpStubT
 CoreMangLib/system/collections/generic/hashset/Regression_Dev10_609271/Regression_Dev10_609271.sh
 CoreMangLib/system/collections/generic/hashset/Regression_Dev10_624201/Regression_Dev10_624201.sh
 GC/Coverage/smalloom/smalloom.sh
+Interop/ExecInDefAppDom/ExecInDefAppDom.sh
 Interop/COM/NETClients/Primitives/NETClientPrimitives/NETClientPrimitives.sh
 Interop/MarshalAPI/IUnknown/IUnknownTest/IUnknownTest.sh
 Interop/SizeConst/SizeConstTest/SizeConstTest.sh