it looks as if exclusive locking didn't work on Linux/.NET Core 1.x

Project: http://git-wip-us.apache.org/repos/asf/logging-log4net/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4net/commit/3a2e0a91
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4net/tree/3a2e0a91
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4net/diff/3a2e0a91

Branch: refs/heads/feature/cd-pipeline
Commit: 3a2e0a913face48abfec270bd1d8af9d3cd06b83
Parents: 354074b
Author: Stefan Bodewig <stefan.bode...@innoq.com>
Authored: Sat Jan 20 22:11:18 2018 +0100
Committer: Stefan Bodewig <stefan.bode...@innoq.com>
Committed: Sat Jan 20 22:11:18 2018 +0100

----------------------------------------------------------------------
 netstandard/log4net.tests/log4net.tests.csproj | 4 ++++
 tests/src/Appender/RollingFileAppenderTest.cs  | 2 ++
 2 files changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3a2e0a91/netstandard/log4net.tests/log4net.tests.csproj
----------------------------------------------------------------------
diff --git a/netstandard/log4net.tests/log4net.tests.csproj 
b/netstandard/log4net.tests/log4net.tests.csproj
index fd57f3e..a168cdb 100755
--- a/netstandard/log4net.tests/log4net.tests.csproj
+++ b/netstandard/log4net.tests/log4net.tests.csproj
@@ -32,6 +32,10 @@ limitations under the License.
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+    
<DefineConstants>$(DefineConstants);NET_STANDARD_1_ON_LINUX</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <Compile 
Include="..\..\tests\src\*.cs;..\..\tests\src\Appender\AppenderCollectionTest.cs;..\..\tests\src\Appender\BufferingAppenderTest.cs;..\..\tests\src\Appender\CountingAppender.cs;..\..\tests\src\Appender\MemoryAppenderTest.cs;..\..\tests\src\Appender\RollingFileAppenderTest.cs;..\..\tests\src\Appender\SmtpPickupDirAppenderTest.cs;..\..\tests\src\Appender\StringAppender.cs;..\..\tests\src\Appender\TraceAppenderTest.cs;..\..\tests\src\Context\LogicalThreadContextTest.cs;..\..\tests\src\Context\ThreadContextTest.cs;..\..\tests\src\Core\**\*.cs;..\..\tests\src\DateFormatter\**\*.cs;..\..\tests\src\Hierarchy\**\*.cs;..\..\tests\src\Layout\**\*.cs;..\..\tests\src\LoggerRepository\**\*.cs;..\..\tests\src\Util\CyclicBufferTest.cs;..\..\tests\src\Util\LogLogTest.cs;..\..\tests\src\Util\PatternConverterTest.cs;..\..\tests\src\Util\RandomStringPatternConverterTest.cs;..\..\tests\src\Util\SystemInfoTest.cs;..\..\tests\src\Util\TransformTest.cs"
 Exclude="bin\**;obj\**;**\*.xproj;packag
 es\**" />
   </ItemGroup>

http://git-wip-us.apache.org/repos/asf/logging-log4net/blob/3a2e0a91/tests/src/Appender/RollingFileAppenderTest.cs
----------------------------------------------------------------------
diff --git a/tests/src/Appender/RollingFileAppenderTest.cs 
b/tests/src/Appender/RollingFileAppenderTest.cs
index 07ebfec..c9d92e9 100644
--- a/tests/src/Appender/RollingFileAppenderTest.cs
+++ b/tests/src/Appender/RollingFileAppenderTest.cs
@@ -1561,8 +1561,10 @@ namespace log4net.Tests.Appender
 
                        Assert.IsTrue(locked, "File was not locked");
 #if !MONO || MONO_3_5 || MONO_4_0 // at least on Linux with Mono 2.4 exclusive 
locking doesn't work as one would expect
+#if !NET_STANDARD_1_ON_LINUX // exclusive locking doesn't seem to work 
properly on .NET Core 1.x on Linux
                        AssertFileEquals(filename, "This is a message" + 
Environment.NewLine + "This is a message 2" + Environment.NewLine);
 #endif
+#endif
                        Assert.AreEqual("", sh.Message, "Unexpected error 
message");
                }
 

Reply via email to