diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-10-29 14:56:44 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2016-10-29 15:09:32 +0300 |
| commit | 01c9543e084d1196a051c4a980b255b0f8b399d5 (patch) | |
| tree | ab7bcb8e36e2eb0d06b678c8cad219cf25a690ab /mcs/class/System.Configuration | |
| parent | a0f51a380344065651abb0d07763350303680247 (diff) | |
[bcl] Add patching of nunit-lite-console.exe.config file
Because nunit-lite runs everything in the same AppDomain, we can't use dll.config files for settings anymore.
Since a few test suites rely on being able to read those settings we need to patch them into the main
nunit-lite-console.exe.config file instead before the test.
Remove all _test.dll.config files and replace with nunit-lite patcher equivalent
Diffstat (limited to 'mcs/class/System.Configuration')
| -rw-r--r-- | mcs/class/System.Configuration/Makefile | 1 | ||||
| -rw-r--r-- | mcs/class/System.Configuration/Test/test-config-file (renamed from mcs/class/System.Configuration/Test/App.config) | 3 | ||||
| -rw-r--r-- | mcs/class/System.Configuration/net_4_x_System.Configuration_test.dll.config | 8 |
3 files changed, 1 insertions, 11 deletions
diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile index 7cdf1b26842..00fdc43d3e1 100644 --- a/mcs/class/System.Configuration/Makefile +++ b/mcs/class/System.Configuration/Makefile @@ -10,6 +10,7 @@ LIB_REFS = secxml/System bare/System.Xml System.Security LIB_MCS_FLAGS = -nowarn:618 TEST_MCS_FLAGS = TEST_LIB_REFS = System.Xml System +TEST_NUNITLITE_APP_CONFIG_GLOBAL=Test/test-config-file include ../../build/library.make diff --git a/mcs/class/System.Configuration/Test/App.config b/mcs/class/System.Configuration/Test/test-config-file index d07b4f882f8..1e8d47f1471 100644 --- a/mcs/class/System.Configuration/Test/App.config +++ b/mcs/class/System.Configuration/Test/test-config-file @@ -1,8 +1,5 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<configuration> <connectionStrings> <add name="test-connstring" connectionString="Server=(local);Initial Catalog=someDb;User Id=someUser;Password=somePassword;Application Name=someAppName;Min Pool Size=5;Max Pool Size=500;Connect Timeout=10;Connection Lifetime=29;" /> </connectionStrings> <appSettings file="Test/appSettings.config" /> -</configuration> diff --git a/mcs/class/System.Configuration/net_4_x_System.Configuration_test.dll.config b/mcs/class/System.Configuration/net_4_x_System.Configuration_test.dll.config deleted file mode 100644 index d07b4f882f8..00000000000 --- a/mcs/class/System.Configuration/net_4_x_System.Configuration_test.dll.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?> -<configuration> - <connectionStrings> - <add name="test-connstring" - connectionString="Server=(local);Initial Catalog=someDb;User Id=someUser;Password=somePassword;Application Name=someAppName;Min Pool Size=5;Max Pool Size=500;Connect Timeout=10;Connection Lifetime=29;" /> - </connectionStrings> - <appSettings file="Test/appSettings.config" /> -</configuration> |