From 7157eaa0fc0a29d188cb29fd3677bfd797d7675a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 11 Nov 2016 14:38:35 +0100 Subject: [PATCH] [msvc] Add Mono_Unix_VersionString to monoposixhelper.def Fixes the EntryPointNotFoundException when running the Mono.Posix tests on Windows. This check was introduced in 249ee0686bf87f33acf2efde76f3645ef06bb886 but the .def file wasn't updated. With this the tests still crash so switching them off on PRs again for now. --- msvc/monoposixhelper.def | 1 + scripts/ci/run-test-default.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/msvc/monoposixhelper.def b/msvc/monoposixhelper.def index 611e4c7035c..027280d5a91 100644 --- a/msvc/monoposixhelper.def +++ b/msvc/monoposixhelper.def @@ -92,6 +92,7 @@ Mono_Posix_ToSyslogLevel Mono_Posix_ToSyslogOptions Mono_Posix_ToWaitOptions Mono_Posix_ToXattrFlags +Mono_Unix_VersionString CreateZStream CloseZStream ReadZStream diff --git a/scripts/ci/run-test-default.sh b/scripts/ci/run-test-default.sh index a531d8002ef..f5381152be2 100755 --- a/scripts/ci/run-test-default.sh +++ b/scripts/ci/run-test-default.sh @@ -25,7 +25,7 @@ fi ${TESTCMD} --label=System.Data --timeout=5m make -w -C mcs/class/System.Data run-test ${TESTCMD} --label=System.Data.OracleClient --timeout=5m make -w -C mcs/class/System.Data.OracleClient run-test; ${TESTCMD} --label=System.Design --timeout=5m make -w -C mcs/class/System.Design run-test; -${TESTCMD} --label=Mono.Posix --timeout=5m make -w -C mcs/class/Mono.Posix run-test +if [[ -n "${ghprbPullId}" ]] && [[ ${label} == w* ]]; then ${TESTCMD} --label=Mono.Posix --skip; else ${TESTCMD} --label=Mono.Posix --timeout=5m make -w -C mcs/class/Mono.Posix run-test; fi ${TESTCMD} --label=System.Web --timeout=30m make -w -C mcs/class/System.Web run-test ${TESTCMD} --label=System.Web.Services --timeout=5m make -w -C mcs/class/System.Web.Services run-test ${TESTCMD} --label=System.Runtime.SFS --timeout=5m make -w -C mcs/class/System.Runtime.Serialization.Formatters.Soap run-test; -- 2.25.1