From f3772edae65f2d1c7ac2e32df700dce5bb5c5408 Mon Sep 17 00:00:00 2001 From: Steve MacLean Date: Tue, 23 Oct 2018 13:29:16 -0400 Subject: [PATCH] Disable ExecuteInDefaultAppDomain test on *nix --- tests/issues.targets | 3 +++ .../Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp | 22 ++++++++++++++++++++++ tests/testsUnsupportedOutsideWindows.txt | 1 + 3 files changed, 26 insertions(+) diff --git a/tests/issues.targets b/tests/issues.targets index 2debfda..ff7da65 100644 --- a/tests/issues.targets +++ b/tests/issues.targets @@ -70,6 +70,9 @@ Native varargs not supported on unix + + Issue building native components for the test. + diff --git a/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp b/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp index cd83137..597c248 100644 --- a/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp +++ b/tests/src/Interop/ExecInDefAppDom/ExecInDefAppDomDll.cpp @@ -3,6 +3,8 @@ // See the LICENSE file in the project root for more information. #include + +#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 + +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 diff --git a/tests/testsUnsupportedOutsideWindows.txt b/tests/testsUnsupportedOutsideWindows.txt index 2f4365f..70a8883 100644 --- a/tests/testsUnsupportedOutsideWindows.txt +++ b/tests/testsUnsupportedOutsideWindows.txt @@ -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 -- 2.7.4