From 2d5ce253734916fc4e75cd28767a6e1eb3c9c1fb Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri@schoolwerth.com>
Date: Sun, 19 Apr 2015 13:34:39 +0400
Subject: [PATCH] Work around failing file watcher test under XP.

Under only Windows XP the test FileSystemWatcherTestCase::TestTrees fails
during the RmDir(treedir) call (SHFileOperation strangely returns
ERROR_DIR_NOT_EMPTY). To make the test pass remove the treedir first and
only then the singledir. This is merely a workaround while the actual
problem is still to be investigated.
---
 tests/fswatcher/fswatchertest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fswatcher/fswatchertest.cpp b/tests/fswatcher/fswatchertest.cpp
index e63e824316..ead7bf7272 100644
--- a/tests/fswatcher/fswatchertest.cpp
+++ b/tests/fswatcher/fswatchertest.cpp
@@ -922,8 +922,8 @@ void FileSystemWatcherTestCase::TestTrees()
             RemoveAllWatches();
 
             // Clean up
-            RmDir(singledir);
             RmDir(treedir);
+            RmDir(singledir);
 
             Exit();
         }