diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-27 22:36:22 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2018-09-27 23:46:49 +0300 |
| commit | 23b1249cc45dbf865c26ec302c09c30771654c6b (patch) | |
| tree | 0065dff55644e48f79ad7eee2947acdb34cf05cd /mcs/class/System.Configuration | |
| parent | a2bb00f75e07c6c6d8fef36fc98a835018fba993 (diff) | |
[bcl] Fix nunitlite app.config file custom logic for tests
Makes it possible to precompute these config without actually running the tests.
Allows System.Configuration tests to use a different file.
Diffstat (limited to 'mcs/class/System.Configuration')
3 files changed, 3 insertions, 3 deletions
diff --git a/mcs/class/System.Configuration/Makefile b/mcs/class/System.Configuration/Makefile index 6e948af0a28..e5405751bdc 100644 --- a/mcs/class/System.Configuration/Makefile +++ b/mcs/class/System.Configuration/Makefile @@ -17,7 +17,7 @@ LIBRARY_WARN_AS_ERROR = yes include ../../build/library.make test-local: - cp Test/appSettings.config $(dir $(NUNITLITE_CONFIG_FILE))/Test-appSettings.config + cp -f Test/appSettings.config $(dir $(NUNITLITE_CONFIG_FILE))/System.Configuration-appSettings.config run-test: $(MAKE) -C Test/standalone diff --git a/mcs/class/System.Configuration/Test/System.Configuration/AppSettingsSectionTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/AppSettingsSectionTest.cs index f0445810330..068345b9afc 100644 --- a/mcs/class/System.Configuration/Test/System.Configuration/AppSettingsSectionTest.cs +++ b/mcs/class/System.Configuration/Test/System.Configuration/AppSettingsSectionTest.cs @@ -67,7 +67,7 @@ namespace MonoTests.System.Configuration var currentAssembly = TestUtil.ThisApplicationPath; var config = ConfigurationManager.OpenExeConfiguration (currentAssembly); - Assert.AreEqual ("Test-appSettings.config", config.AppSettings.File, "#A01"); + Assert.AreEqual ("System.Configuration-appSettings.config", config.AppSettings.File, "#A01"); Assert.AreEqual ("foo", ConfigurationSettings.AppSettings["TestKey1"], "#A02"); Assert.AreEqual ("bar", ConfigurationSettings.AppSettings["TestKey2"], "#A03"); } diff --git a/mcs/class/System.Configuration/Test/test-config-file b/mcs/class/System.Configuration/Test/test-config-file index 5920c6c2ab0..462d45aeb2b 100644 --- a/mcs/class/System.Configuration/Test/test-config-file +++ b/mcs/class/System.Configuration/Test/test-config-file @@ -2,4 +2,4 @@ <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" /> + <appSettings file="System.Configuration-appSettings.config" /> |