diff options
| author | Marek Safar <marek.safar@gmail.com> | 2017-08-25 01:13:07 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-11-27 13:15:07 +0300 |
| commit | 22adb80c21d3c9d997d830bfef12cd1efa62abdb (patch) | |
| tree | 1e2d1bc0557f6b087d5f56f88d381c6a8f4257ba /acceptance-tests | |
| parent | 5f7452f384940c54ea9fed8189d97d094a14b8fa (diff) | |
Update roslyn tests
Diffstat (limited to 'acceptance-tests')
| -rw-r--r-- | acceptance-tests/Makefile.am | 1 | ||||
| -rw-r--r-- | acceptance-tests/SUBMODULES.json | 8 | ||||
| -rw-r--r-- | acceptance-tests/roslyn.mk | 17 |
3 files changed, 7 insertions, 19 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am index 2e47df81bd0..135e6968e66 100644 --- a/acceptance-tests/Makefile.am +++ b/acceptance-tests/Makefile.am @@ -14,6 +14,7 @@ RUNTIME = MONO_PATH=$(CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug TOOLS_RUNTIME = MONO_PATH=$(TOOLS_CLASS) $(abs_top_builddir)/runtime/mono-wrapper --debug MCS = $(TOOLS_RUNTIME) $(CSC) -nologo -noconfig -lib:$(CLASS) -r:System.dll -r:System.Core.dll -r:System.Xml.dll -r:Microsoft.CSharp.dll ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe +XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe include versions.mk include profiler-stress.mk diff --git a/acceptance-tests/SUBMODULES.json b/acceptance-tests/SUBMODULES.json index 5465a7e771c..e205c73f395 100644 --- a/acceptance-tests/SUBMODULES.json +++ b/acceptance-tests/SUBMODULES.json @@ -1,10 +1,10 @@ [ { "name": "roslyn", - "url": "git://github.com/dotnet/roslyn.git", - "rev": "322bd5b2bbf07df6a67de35cbcb2365484412f70", - "remote-branch": "origin/master", - "branch": "master", + "url": "git://github.com/mono/roslyn.git", + "rev": "1d9895045041925490038c5df0d8f947d8dcbd7f", + "remote-branch": "origin/mono-testing", + "branch": "mono-testing", "directory": "roslyn" }, { diff --git a/acceptance-tests/roslyn.mk b/acceptance-tests/roslyn.mk index a91c68d986b..c4e8c866493 100644 --- a/acceptance-tests/roslyn.mk +++ b/acceptance-tests/roslyn.mk @@ -1,18 +1,5 @@ check-roslyn: @$(MAKE) validate-roslyn RESET_VERSIONS=1 - @if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi - sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \ - export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \ - MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \ - if [ ! -d "$$MONO_DOTNET_PORTABLE_DIR/v4.6" ]; then \ - mkdir -p $$MONO_DOTNET_PORTABLE_DIR; \ - curl -SL "http://download.mono-project.com/third-party/RoslynBuildDependencies.zip" > /tmp/RoslynBuildDependencies.zip; \ - unzip -o /tmp/RoslynBuildDependencies.zip -d /tmp/RoslynBuildDependencies; \ - cp -r /tmp/RoslynBuildDependencies/PortableReferenceAssemblies/* $$MONO_DOTNET_PORTABLE_DIR; \ - fi; \ cd $(ROSLYN_PATH); \ - sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \ - sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \ - ./cibuild.sh --mono-path $$PREFIX/bin || EXIT_CODE=1; \ - sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \ - exit $$EXIT_CODE + ./mono-testing.sh "$(XUNIT)" || exit; \ + echo "done" |