diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-09 20:57:10 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-09 20:59:07 +0300 |
| commit | c7653165299eda941cfc251a31256cd0ceff720c (patch) | |
| tree | 81ecf3398e8ceabf91ce8313d94324eb0ae703b2 /acceptance-tests | |
| parent | 0217438747001f40a4a49d6ab3ffb92866bb2fe4 (diff) | |
[acceptance-tests] Ensure Roslyn is bootstrapping with Mono
It tried to use CoreCLR but that doesn't work on Jenkins since some of the dependencies are missing there.
We actually want to ensure it's always using Mono so we can catch errors on our side, so we need this
hack until we have an option in the script upstream.
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/Makefile.am | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 2129dee140e..f20846ec344 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -43,7 +43,9 @@ check-roslyn: cp /tmp/RoslynBuildDependencies/NuGetTargets/* $$MONO_NUGET_TARGETS_DIR; \ cp /tmp/RoslynBuildDependencies/PortableTargets/* $$MONO_PORTABLE_TARGETS_DIR; \ fi; \ - cd $(ROSLYN_PATH) && ./cibuild.sh --mono-path $$PREFIX/bin + cd $(ROSLYN_PATH); \ + sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \ + ./cibuild.sh --mono-path $$PREFIX/bin coreclr-validate: $(MAKE) validate-coreclr RESET_VERSIONS=1 |