diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-10-10 14:41:34 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-10 14:41:34 +0300 |
| commit | 75415afa764698318a6d8554a714446f8f949d20 (patch) | |
| tree | 5e7c63fa153ff1fedffd23b8d9fbc46e02109527 /mcs/packages | |
| parent | c4bee6af4d15cdfc561b3bd2d7f90e16053b5b6c (diff) | |
[bcl] Fix csi to work on Mono (#5737)
It'd fail to find System.Runtime.dll and System.ValueTuple.dll.
Changed the csi.rsp to include those from the Facades/ dir and added a test.
Workaround for https://bugzilla.xamarin.com/show_bug.cgi?id=58965
Diffstat (limited to 'mcs/packages')
| -rw-r--r-- | mcs/packages/.gitignore | 3 | ||||
| -rw-r--r-- | mcs/packages/Makefile | 9 | ||||
| -rw-r--r-- | mcs/packages/csi-test.csx | 1 |
3 files changed, 11 insertions, 2 deletions
diff --git a/mcs/packages/.gitignore b/mcs/packages/.gitignore index 5264e07d2df..2bd7fca3250 100644 --- a/mcs/packages/.gitignore +++ b/mcs/packages/.gitignore @@ -1 +1,2 @@ -Microsoft.Net.Compilers*
\ No newline at end of file +Microsoft.Net.Compilers* +csi-test-output.txt diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index 9980aa9be99..c5db5962eab 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -38,7 +38,7 @@ ROSLYN_FILES_TO_LINK_FOR_MSBUILD = \ VBCSCompiler.exe \ VBCSCompiler.exe.config -DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) +DISTFILES = $(ROSLYN_FILES_FOR_MONO) $(ROSLYN_FILES_TO_COPY_FOR_MSBUILD) csi-test.csx ifeq ($(PROFILE), $(DEFAULT_PROFILE)) @@ -53,6 +53,13 @@ install-local: (cd $(MSBUILD_ROSLYN_DIR); for asm in $(ROSLYN_FILES_TO_LINK_FOR_MSBUILD); do ln -fs ../../../../$(FRAMEWORK_VERSION)/$$asm . ; done) +run-test-local: test-csi + +test-csi: + MONO_PATH="$(topdir)/class/lib/$(PROFILE)" $(RUNTIME) $(ROSLYN_CSC_DIR)/csi.exe csi-test.csx > csi-test-output.txt + cat csi-test-output.txt && grep -q "hello world" csi-test-output.txt + rm csi-test-output.txt + endif dist-local: dist-default diff --git a/mcs/packages/csi-test.csx b/mcs/packages/csi-test.csx new file mode 100644 index 00000000000..7ae4576307e --- /dev/null +++ b/mcs/packages/csi-test.csx @@ -0,0 +1 @@ +Console.WriteLine ("hello world: " + DateTime.Now) |