Skip to content

Commit 877ede4

Browse files
committed
Tests: Restored original behavior of test configuration for configuration in working folder.
1 parent dfb877f commit 877ede4

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/NHibernate.Test/TestConfigurationHelper.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,11 @@ private static string FindCurrentTestConfigurationFile(string filename)
5656
string relativeSearchPath = AppDomain.CurrentDomain.RelativeSearchPath;
5757
string folder = relativeSearchPath == null ? baseDir : Path.Combine(baseDir, relativeSearchPath);
5858

59+
// Check for the file right in the working folder first.
60+
if (File.Exists(Path.Combine(folder, filename)))
61+
return Path.Combine(folder, filename);
62+
63+
// Look for a "current-test-configuration" folder up in all the parent folders.
5964
while (folder != null)
6065
{
6166
string current = Path.Combine(Path.Combine(folder, CurrentTestConfiguration), filename);

0 commit comments

Comments
 (0)