diff options
| author | Johan Lorensson <lateralusx.github@gmail.com> | 2019-02-20 22:17:10 +0300 |
|---|---|---|
| committer | Ludovic Henry <luhenry@microsoft.com> | 2019-02-20 22:17:10 +0300 |
| commit | 795dc5ebd27eb13aa8eef4676e98a674e430ab12 (patch) | |
| tree | f7fb2beec90363f7f0b6987ad429a0a59d186ab4 /runtime | |
| parent | 3bcebfb0a0021be05606044acb20270a5e2438ec (diff) | |
Remaining fixes needed to pass rest of CI test suites for windows x64 full AOT. (#13084)
* Fix for runtime mcs-compileall test on Windows x64 full AOT.
Test picked up full AOT:ed libraries as well as managed libraries failing
the test. Full AOT:ed shared libraries on Windows has .dll.dll prefix and
full AOT:ed executables on Windows has .exe.dll prefix.
Fix makes sure to filter out any files ending with dll.dll or exe.dll.
* Fix build errors in System.Web.Services test under winaot profile.
* Fix errors in System.Core test under winaot profile.
* Fix build error in linker tests on Windows under winaot profile.
Build fails since profile build mscorlib is used as well as default
triggering build error. Fix is to build linker tests using -nostdlib flag.
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am index 22c0f61b973..f7c8f284a0b 100644 --- a/runtime/Makefile.am +++ b/runtime/Makefile.am @@ -219,7 +219,7 @@ mcs-compileall: mono-wrapper etc/mono/config else \ MONO_PATH="$$mcs_topdir/class/lib/$$profile$(PLATFORM_PATH_SEPARATOR)$$save_MONO_PATH"; \ fi; \ - export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' $(foreach asm,$(VERIFY_TESTS_FILTER), | grep -v $(asm))` ; \ + export verifiable_files=`ls "$(mcs_topdir)/class/lib/$$profile/" | grep -E '\.(dll|exe)$$' | grep -v '\.dll\.dll$$' | grep -v '\.exe\.dll$$' $(foreach asm,$(VERIFY_TESTS_FILTER), | grep -v $(asm))` ; \ export MONO_PATH; \ for stub in $$verifiable_files; do \ i=$(mcs_topdir)/class/lib/$$profile/$$stub ; \ |