diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-25 15:56:15 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-25 15:56:15 +0300 |
| commit | fe590b4eb0f967121fbaffdeab8a70bb8bc034c4 (patch) | |
| tree | cfd59797fd0b914b7b86bdca53098a2866c38fff /mcs/tests | |
| parent | 22d5a4d552208b19ab1c1ee21d9c4dcf8f9bf07a (diff) | |
[mcs] Add option to specify reference directory to compiler-tester (#10787)
We can use this to pass a directory the tests can use for -r or -lib.
Also fix cs1703-2.cs to not rely on binary outside repo during test.
Diffstat (limited to 'mcs/tests')
| -rw-r--r-- | mcs/tests/Makefile | 4 | ||||
| -rw-r--r-- | mcs/tests/gtest-exmethod-23.cs | 2 | ||||
| -rw-r--r-- | mcs/tests/test-695.cs | 2 | ||||
| -rw-r--r-- | mcs/tests/test-814.cs | 2 | ||||
| -rw-r--r-- | mcs/tests/test-937.cs | 2 | ||||
| -rw-r--r-- | mcs/tests/test-async-76.cs | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/mcs/tests/Makefile b/mcs/tests/Makefile index a90bdfbbfd1..e6824ac77f2 100644 --- a/mcs/tests/Makefile +++ b/mcs/tests/Makefile @@ -71,10 +71,10 @@ KNOWN_ISSUES = known-issues-$(PROFILE) endif qcheck2: - $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -issues:$(KNOWN_ISSUES) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS) + $(TESTER) -mode:pos -files:$(TEST_PATTERN) -compiler:$(COMPILER) -reference-dir:$(topdir)/class/lib/$(PROFILE) -issues:$(KNOWN_ISSUES) -log:$(PROFILE).log -il:ver-il-$(PROFILE).xml $(DEFINES) $(TOPTIONS) gen-mt-tests: - $(TESTER) -mode:nunit -files:'v2' -compiler:$(COMPILER) -issues:known-issues-mt -compiler-options:"-lib:$(topdir)/class/lib/monotouch projects/MonoTouch/ivt.cs" + $(TESTER) -mode:nunit -files:'v2' -compiler:$(COMPILER) -reference-dir:$(topdir)/class/lib/$(PROFILE) -issues:known-issues-mt -compiler-options:"-lib:$(topdir)/class/lib/monotouch projects/MonoTouch/ivt.cs" TESTERVERBOSE=$(if $(V),-verbose,) diff --git a/mcs/tests/gtest-exmethod-23.cs b/mcs/tests/gtest-exmethod-23.cs index 936d89ee387..82fcc82c1ca 100644 --- a/mcs/tests/gtest-exmethod-23.cs +++ b/mcs/tests/gtest-exmethod-23.cs @@ -1,4 +1,4 @@ -// Compiler options: -nostdlib -noconfig -r:mscorlib.dll -r:System.Core.dll -lib:../class/lib/net_4_x +// Compiler options: -nostdlib -noconfig -r:mscorlib.dll -r:System.Core.dll -lib:$REF_DIR public static class T { diff --git a/mcs/tests/test-695.cs b/mcs/tests/test-695.cs index 1db1225cf14..9f6465d3cd5 100644 --- a/mcs/tests/test-695.cs +++ b/mcs/tests/test-695.cs @@ -1,4 +1,4 @@ -// Compiler options: -r:../class/lib/net_4_x/Mono.Cecil.dll +// Compiler options: -r:$REF_DIR/Mono.Cecil.dll using System; using System.IO; diff --git a/mcs/tests/test-814.cs b/mcs/tests/test-814.cs index d6a9e76dea3..8003ad6509a 100644 --- a/mcs/tests/test-814.cs +++ b/mcs/tests/test-814.cs @@ -1,4 +1,4 @@ -// Compiler options: -r:../class/lib/net_4_x/Mono.Cecil.dll +// Compiler options: -r:$REF_DIR/Mono.Cecil.dll using System; using Mono.Cecil; diff --git a/mcs/tests/test-937.cs b/mcs/tests/test-937.cs index b577d34e7f6..cc30b15d8e4 100644 --- a/mcs/tests/test-937.cs +++ b/mcs/tests/test-937.cs @@ -1,4 +1,4 @@ -// Compiler options: /noconfig /nostdlib -r:../class/lib/net_4_x/Facades/System.Runtime.dll -r:../class/lib/net_4_x/mscorlib.dll +// Compiler options: /noconfig /nostdlib -r:$REF_DIR/Facades/System.Runtime.dll -r:$REF_DIR/mscorlib.dll using System; diff --git a/mcs/tests/test-async-76.cs b/mcs/tests/test-async-76.cs index 7012722bb9b..b7e5da9ef3e 100644 --- a/mcs/tests/test-async-76.cs +++ b/mcs/tests/test-async-76.cs @@ -1,4 +1,4 @@ -// Compiler options: -r:../class/lib/net_4_x/Mono.Cecil.dll +// Compiler options: -r:$REF_DIR/Mono.Cecil.dll using System; using System.Threading.Tasks; |