diff options
| author | Zoltan Varga <vargaz@gmail.com> | 2017-08-07 15:03:48 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2017-08-07 15:03:48 +0300 |
| commit | 33d2d526448c17dd50e171804c614ef16d66e6aa (patch) | |
| tree | 17193f3e8b6704bf43cf518430562606365ab9d6 /mcs/class/Mono.Reactive.Testing | |
| parent | c65f48052a483ab8a06ff5839d5e346ac9e39c97 (diff) | |
[bcl] Specify the name of the key file on the command line instead of using the AssemblyKeyFile attribute for consistency and to make it easier to do path name manipulation on the file name. (#5316)
Diffstat (limited to 'mcs/class/Mono.Reactive.Testing')
| -rw-r--r-- | mcs/class/Mono.Reactive.Testing/Makefile | 3 | ||||
| -rw-r--r-- | mcs/class/Mono.Reactive.Testing/more_build_args | 0 |
2 files changed, 1 insertions, 2 deletions
diff --git a/mcs/class/Mono.Reactive.Testing/Makefile b/mcs/class/Mono.Reactive.Testing/Makefile index aa931ee9db7..25038b344bf 100644 --- a/mcs/class/Mono.Reactive.Testing/Makefile +++ b/mcs/class/Mono.Reactive.Testing/Makefile @@ -5,7 +5,6 @@ include ../../build/rules.make LIBRARY = Mono.Reactive.Testing.dll LIB_REFS = System System.Core System.Reactive.Interfaces System.Reactive.Core System.Reactive.Linq System.Reactive.PlatformServices System.Reactive.Providers System.Reactive.Runtime.Remoting System.Reactive.Experimental System.Reactive.Windows.Forms System.Reactive.Windows.Threading System.Reactive.Observable.Aliases System.Windows.Forms WindowsBase nunitlite LIB_MCS_FLAGS = \ - @more_build_args \ -d:NUNIT -d:MONO -d:DESKTOPCLR # NO_PERF is required to disable ObservableMultipleTest.Catch_TailRecursive2 which blocked test execution. # disabled -d:HAS_WINFORMS @@ -21,7 +20,7 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) -nowarn:0618 -EXTRA_DISTFILES = more_build_args +EXTRA_DISTFILES = VALID_PROFILE := $(filter net_4_x, $(PROFILE)) ifndef VALID_PROFILE diff --git a/mcs/class/Mono.Reactive.Testing/more_build_args b/mcs/class/Mono.Reactive.Testing/more_build_args deleted file mode 100644 index e69de29bb2d..00000000000 --- a/mcs/class/Mono.Reactive.Testing/more_build_args +++ /dev/null |