You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucy.apache.org by nw...@apache.org on 2015/07/12 13:23:11 UTC
[1/3] lucy git commit: Fix windows.h name clashes
Repository: lucy
Updated Branches:
refs/heads/master 48b9c3b01 -> 66126d7d7
Fix windows.h name clashes
windows.h defines BOOLEAN and FLOAT, clashing with the new short name
class vars.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/d2c472a2
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/d2c472a2
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/d2c472a2
Branch: refs/heads/master
Commit: d2c472a269ac94506b43c8ba706a70fc5879eebc
Parents: 48b9c3b
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 12 11:42:24 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 12 11:42:24 2015 +0200
----------------------------------------------------------------------
core/Lucy/Analysis/Normalizer.c | 1 +
core/Lucy/Analysis/SnowballStopFilter.c | 1 +
core/Lucy/Index/DeletionsWriter.c | 1 +
core/Lucy/Index/DocWriter.c | 1 +
core/Lucy/Index/FilePurger.c | 1 +
core/Lucy/Index/Indexer.c | 1 +
core/Lucy/Index/Segment.c | 1 +
core/Lucy/Index/Snapshot.c | 1 +
core/Lucy/Index/SortCache/NumericSortCache.c | 1 +
core/Lucy/Index/SortFieldWriter.c | 1 +
core/Lucy/Plan/BlobType.c | 1 +
core/Lucy/Plan/FullTextType.c | 1 +
core/Lucy/Plan/NumericType.c | 1 +
core/Lucy/Plan/StringType.c | 1 +
core/Lucy/Search/NoMatchQuery.c | 1 +
core/Lucy/Search/RangeQuery.c | 1 +
core/Lucy/Test/Analysis/TestCaseFolder.c | 1 +
core/Lucy/Test/Analysis/TestNormalizer.c | 1 +
core/Lucy/Test/Search/TestMatchAllQuery.c | 1 +
core/Lucy/Test/Search/TestNoMatchQuery.c | 1 +
core/Lucy/Test/Search/TestQueryParserSyntax.c | 1 +
core/Lucy/Test/Search/TestSortSpec.c | 1 +
core/Lucy/Test/Util/TestFreezer.c | 2 ++
core/Lucy/Test/Util/TestJson.c | 1 +
core/Lucy/Test/Util/TestPriorityQueue.c | 1 +
core/Lucy/Util/Freezer.c | 2 ++
core/Lucy/Util/Json.c | 2 ++
core/Lucy/Util/ToolSet.h | 2 --
28 files changed, 30 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Analysis/Normalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/Normalizer.c b/core/Lucy/Analysis/Normalizer.c
index 6be0e96..4258374 100644
--- a/core/Lucy/Analysis/Normalizer.c
+++ b/core/Lucy/Analysis/Normalizer.c
@@ -20,6 +20,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Analysis/Normalizer.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Analysis/Token.h"
#include "Lucy/Analysis/Inversion.h"
#include "Lucy/Util/Json.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Analysis/SnowballStopFilter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Analysis/SnowballStopFilter.c b/core/Lucy/Analysis/SnowballStopFilter.c
index f7c16fd..80bff45 100644
--- a/core/Lucy/Analysis/SnowballStopFilter.c
+++ b/core/Lucy/Analysis/SnowballStopFilter.c
@@ -20,6 +20,7 @@
#include <ctype.h>
#include "Lucy/Analysis/SnowballStopFilter.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Analysis/Token.h"
#include "Lucy/Analysis/Inversion.h"
#include "Lucy/Util/Freezer.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/DeletionsWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DeletionsWriter.c b/core/Lucy/Index/DeletionsWriter.c
index aa020ad..103feae 100644
--- a/core/Lucy/Index/DeletionsWriter.c
+++ b/core/Lucy/Index/DeletionsWriter.c
@@ -21,6 +21,7 @@
#include <math.h>
#include "Clownfish/HashIterator.h"
+#include "Clownfish/Num.h"
#include "Lucy/Index/DeletionsWriter.h"
#include "Lucy/Index/DeletionsReader.h"
#include "Lucy/Index/IndexReader.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/DocWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/DocWriter.c b/core/Lucy/Index/DocWriter.c
index 49bbf6d..08f450c 100644
--- a/core/Lucy/Index/DocWriter.c
+++ b/core/Lucy/Index/DocWriter.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Blob.h"
+#include "Clownfish/Num.h"
#include "Lucy/Index/DocWriter.h"
#include "Lucy/Document/Doc.h"
#include "Lucy/Index/DocReader.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/FilePurger.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/FilePurger.c b/core/Lucy/Index/FilePurger.c
index a128961..225113e 100644
--- a/core/Lucy/Index/FilePurger.c
+++ b/core/Lucy/Index/FilePurger.c
@@ -19,6 +19,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/FilePurger.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Index/IndexManager.h"
#include "Lucy/Index/Segment.h"
#include "Lucy/Index/Snapshot.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/Indexer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Indexer.c b/core/Lucy/Index/Indexer.c
index 60b7564..103098f 100644
--- a/core/Lucy/Index/Indexer.c
+++ b/core/Lucy/Index/Indexer.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/Indexer.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Analysis/Analyzer.h"
#include "Lucy/Document/Doc.h"
#include "Lucy/Plan/FieldType.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/Segment.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Segment.c b/core/Lucy/Index/Segment.c
index f016512..b93f721 100644
--- a/core/Lucy/Index/Segment.c
+++ b/core/Lucy/Index/Segment.c
@@ -20,6 +20,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/Segment.h"
+#include "Clownfish/Num.h"
#include "Lucy/Store/Folder.h"
#include "Lucy/Util/Json.h"
#include "Clownfish/Util/StringHelper.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/Snapshot.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/Snapshot.c b/core/Lucy/Index/Snapshot.c
index 90a91c7..6aad5cd 100644
--- a/core/Lucy/Index/Snapshot.c
+++ b/core/Lucy/Index/Snapshot.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/Snapshot.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Index/Segment.h"
#include "Lucy/Store/Folder.h"
#include "Clownfish/Util/StringHelper.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/SortCache/NumericSortCache.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortCache/NumericSortCache.c b/core/Lucy/Index/SortCache/NumericSortCache.c
index 3355978..fc83844 100644
--- a/core/Lucy/Index/SortCache/NumericSortCache.c
+++ b/core/Lucy/Index/SortCache/NumericSortCache.c
@@ -22,6 +22,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Index/SortCache/NumericSortCache.h"
+#include "Clownfish/Num.h"
#include "Lucy/Index/Segment.h"
#include "Lucy/Plan/FieldType.h"
#include "Lucy/Plan/NumericType.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Index/SortFieldWriter.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Index/SortFieldWriter.c b/core/Lucy/Index/SortFieldWriter.c
index bb05aa0..95007a9 100644
--- a/core/Lucy/Index/SortFieldWriter.c
+++ b/core/Lucy/Index/SortFieldWriter.c
@@ -37,6 +37,7 @@
#include "Lucy/Store/OutStream.h"
#include "Lucy/Util/NumberUtils.h"
#include "Clownfish/Blob.h"
+#include "Clownfish/Num.h"
#include "Clownfish/Util/Memory.h"
#include "Clownfish/Util/SortUtils.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Plan/BlobType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/BlobType.c b/core/Lucy/Plan/BlobType.c
index 608b0a0..dafd836 100644
--- a/core/Lucy/Plan/BlobType.c
+++ b/core/Lucy/Plan/BlobType.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Plan/BlobType.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Util/Json.h"
BlobType*
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Plan/FullTextType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/FullTextType.c b/core/Lucy/Plan/FullTextType.c
index ead988b..ce01f11 100644
--- a/core/Lucy/Plan/FullTextType.c
+++ b/core/Lucy/Plan/FullTextType.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Plan/FullTextType.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Analysis/Analyzer.h"
#include "Lucy/Index/Posting/ScorePosting.h"
#include "Lucy/Index/Similarity.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Plan/NumericType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/NumericType.c b/core/Lucy/Plan/NumericType.c
index 4927709..321a1f3 100644
--- a/core/Lucy/Plan/NumericType.c
+++ b/core/Lucy/Plan/NumericType.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Plan/NumericType.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Util/Json.h"
NumericType*
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Plan/StringType.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Plan/StringType.c b/core/Lucy/Plan/StringType.c
index 2a00d12..ce47806 100644
--- a/core/Lucy/Plan/StringType.c
+++ b/core/Lucy/Plan/StringType.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Plan/StringType.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Index/Posting/ScorePosting.h"
#include "Lucy/Index/Similarity.h"
#include "Lucy/Util/Json.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Search/NoMatchQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/NoMatchQuery.c b/core/Lucy/Search/NoMatchQuery.c
index 6d698d2..533f271 100644
--- a/core/Lucy/Search/NoMatchQuery.c
+++ b/core/Lucy/Search/NoMatchQuery.c
@@ -18,6 +18,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Search/NoMatchQuery.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Index/SegReader.h"
#include "Lucy/Index/Similarity.h"
#include "Lucy/Plan/Schema.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Search/RangeQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Search/RangeQuery.c b/core/Lucy/Search/RangeQuery.c
index ed340e5..39956b8 100644
--- a/core/Lucy/Search/RangeQuery.c
+++ b/core/Lucy/Search/RangeQuery.c
@@ -19,6 +19,7 @@
#include "Lucy/Util/ToolSet.h"
#include "Lucy/Search/RangeQuery.h"
+#include "Clownfish/Boolean.h"
#include "Lucy/Index/DocVector.h"
#include "Lucy/Index/SegReader.h"
#include "Lucy/Index/Similarity.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Analysis/TestCaseFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestCaseFolder.c b/core/Lucy/Test/Analysis/TestCaseFolder.c
index 365ba99..115362d 100644
--- a/core/Lucy/Test/Analysis/TestCaseFolder.c
+++ b/core/Lucy/Test/Analysis/TestCaseFolder.c
@@ -18,6 +18,7 @@
#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Boolean.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/TestUtils.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Analysis/TestNormalizer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Analysis/TestNormalizer.c b/core/Lucy/Test/Analysis/TestNormalizer.c
index 34bd173..3c0c618 100644
--- a/core/Lucy/Test/Analysis/TestNormalizer.c
+++ b/core/Lucy/Test/Analysis/TestNormalizer.c
@@ -19,6 +19,7 @@
#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Boolean.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Clownfish/TestHarness/TestUtils.h"
#include "Lucy/Test.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Search/TestMatchAllQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestMatchAllQuery.c b/core/Lucy/Test/Search/TestMatchAllQuery.c
index 9a5f030..524d25d 100644
--- a/core/Lucy/Test/Search/TestMatchAllQuery.c
+++ b/core/Lucy/Test/Search/TestMatchAllQuery.c
@@ -19,6 +19,7 @@
#include "Lucy/Util/ToolSet.h"
#include <math.h>
+#include "Clownfish/Boolean.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/TestUtils.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Search/TestNoMatchQuery.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestNoMatchQuery.c b/core/Lucy/Test/Search/TestNoMatchQuery.c
index f116bd2..bac28b9 100644
--- a/core/Lucy/Test/Search/TestNoMatchQuery.c
+++ b/core/Lucy/Test/Search/TestNoMatchQuery.c
@@ -19,6 +19,7 @@
#include "Lucy/Util/ToolSet.h"
#include <math.h>
+#include "Clownfish/Boolean.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/TestUtils.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Search/TestQueryParserSyntax.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestQueryParserSyntax.c b/core/Lucy/Test/Search/TestQueryParserSyntax.c
index 0eea781..78287f4 100644
--- a/core/Lucy/Test/Search/TestQueryParserSyntax.c
+++ b/core/Lucy/Test/Search/TestQueryParserSyntax.c
@@ -20,6 +20,7 @@
#include "Lucy/Util/ToolSet.h"
#include <string.h>
+#include "Clownfish/Boolean.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/Search/TestQueryParserSyntax.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Search/TestSortSpec.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Search/TestSortSpec.c b/core/Lucy/Test/Search/TestSortSpec.c
index 6b4afb2..ce092b8 100644
--- a/core/Lucy/Test/Search/TestSortSpec.c
+++ b/core/Lucy/Test/Search/TestSortSpec.c
@@ -31,6 +31,7 @@
#include "Lucy/Search/SortSpec.h"
#include "Clownfish/CharBuf.h"
+#include "Clownfish/Num.h"
#include "Lucy/Analysis/StandardTokenizer.h"
#include "Lucy/Document/Doc.h"
#include "Lucy/Document/HitDoc.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Util/TestFreezer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestFreezer.c b/core/Lucy/Test/Util/TestFreezer.c
index 50543bc..2f229ee 100644
--- a/core/Lucy/Test/Util/TestFreezer.c
+++ b/core/Lucy/Test/Util/TestFreezer.c
@@ -19,6 +19,8 @@
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Blob.h"
+#include "Clownfish/Boolean.h"
+#include "Clownfish/Num.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Clownfish/TestHarness/TestUtils.h"
#include "Lucy/Test/Util/TestFreezer.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Util/TestJson.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestJson.c b/core/Lucy/Test/Util/TestJson.c
index 8e858d8..1286d6b 100644
--- a/core/Lucy/Test/Util/TestJson.c
+++ b/core/Lucy/Test/Util/TestJson.c
@@ -18,6 +18,7 @@
#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Num.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/Util/TestJson.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Test/Util/TestPriorityQueue.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Util/TestPriorityQueue.c b/core/Lucy/Test/Util/TestPriorityQueue.c
index e84bf3a..7265170 100644
--- a/core/Lucy/Test/Util/TestPriorityQueue.c
+++ b/core/Lucy/Test/Util/TestPriorityQueue.c
@@ -18,6 +18,7 @@
#define TESTLUCY_USE_SHORT_NAMES
#include "Lucy/Util/ToolSet.h"
+#include "Clownfish/Num.h"
#include "Clownfish/TestHarness/TestBatchRunner.h"
#include "Lucy/Test.h"
#include "Lucy/Test/Util/TestPriorityQueue.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Util/Freezer.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Freezer.c b/core/Lucy/Util/Freezer.c
index 11b82d5..e032baa 100644
--- a/core/Lucy/Util/Freezer.c
+++ b/core/Lucy/Util/Freezer.c
@@ -18,7 +18,9 @@
#include "Lucy/Util/ToolSet.h"
#include "Clownfish/Blob.h"
+#include "Clownfish/Boolean.h"
#include "Clownfish/HashIterator.h"
+#include "Clownfish/Num.h"
#include "Lucy/Util/Freezer.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Util/Json.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/Json.c b/core/Lucy/Util/Json.c
index 002485e..c346275 100644
--- a/core/Lucy/Util/Json.c
+++ b/core/Lucy/Util/Json.c
@@ -21,7 +21,9 @@
#include "Lucy/Util/Json.h"
+#include "Clownfish/Boolean.h"
#include "Clownfish/CharBuf.h"
+#include "Clownfish/Num.h"
#include "Lucy/Store/Folder.h"
#include "Lucy/Store/InStream.h"
#include "Lucy/Store/OutStream.h"
http://git-wip-us.apache.org/repos/asf/lucy/blob/d2c472a2/core/Lucy/Util/ToolSet.h
----------------------------------------------------------------------
diff --git a/core/Lucy/Util/ToolSet.h b/core/Lucy/Util/ToolSet.h
index 23d321b..2d7a7a9 100644
--- a/core/Lucy/Util/ToolSet.h
+++ b/core/Lucy/Util/ToolSet.h
@@ -37,13 +37,11 @@ extern "C" {
#include <string.h>
#include "Clownfish/Obj.h"
#include "Lucy/Object/BitVector.h"
-#include "Clownfish/Boolean.h"
#include "Clownfish/ByteBuf.h"
#include "Clownfish/String.h"
#include "Clownfish/Err.h"
#include "Clownfish/Hash.h"
#include "Lucy/Object/I32Array.h"
-#include "Clownfish/Num.h"
#include "Clownfish/Vector.h"
#include "Clownfish/Class.h"
#include "Clownfish/Util/Memory.h"
[3/3] lucy git commit: Add some comments on failing Windows tests
Posted by nw...@apache.org.
Add some comments on failing Windows tests
Some of the failing tests are related to the well-known file deletion
problem. But there are also two strange failures when renaming a dir
to itself and after an invalid hard link operation.
On my Windows 7 machine, any of these failures happens about once every
10-30 test runs. I also got a single segfault in TestFSFolder once after
about 200 runs.
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/66126d7d
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/66126d7d
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/66126d7d
Branch: refs/heads/master
Commit: 66126d7d749dfd07a99f8a2a4f07d1f8d11e4688
Parents: 4342848
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 12 13:18:49 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 12 13:18:49 2015 +0200
----------------------------------------------------------------------
core/Lucy/Test/Store/TestFSFolder.c | 8 ++++++--
core/Lucy/Test/Store/TestFolderCommon.c | 3 +++
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/66126d7d/core/Lucy/Test/Store/TestFSFolder.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFSFolder.c b/core/Lucy/Test/Store/TestFSFolder.c
index aba0acc..23ee684 100644
--- a/core/Lucy/Test/Store/TestFSFolder.c
+++ b/core/Lucy/Test/Store/TestFSFolder.c
@@ -71,8 +71,12 @@ S_set_up() {
static void
S_tear_down() {
struct stat stat_buf;
- rmdir("_fstest");
- /* FIXME: This can fail on Windows. */
+ int result = rmdir("_fstest");
+ if (result < 0) {
+ /* FIXME: This can fail on Windows with ENOTEMPTY. */
+ THROW(ERR, "Can't clean up directory _fstest: %s", strerror(errno));
+ }
+ /* FIXME: This can also fail on Windows even if rmdir was successful. */
if (stat("_fstest", &stat_buf) != -1) {
THROW(ERR, "Can't clean up directory _fstest");
}
http://git-wip-us.apache.org/repos/asf/lucy/blob/66126d7d/core/Lucy/Test/Store/TestFolderCommon.c
----------------------------------------------------------------------
diff --git a/core/Lucy/Test/Store/TestFolderCommon.c b/core/Lucy/Test/Store/TestFolderCommon.c
index d5f3a9d..07a9850 100644
--- a/core/Lucy/Test/Store/TestFolderCommon.c
+++ b/core/Lucy/Test/Store/TestFolderCommon.c
@@ -279,6 +279,7 @@ test_Local_Delete(TestBatchRunner *runner, set_up_t set_up, tear_down_t tear_dow
Folder_Delete(folder, foo_boffo);
TEST_TRUE(runner, Folder_Local_Delete(folder, foo),
"Local_Delete on empty dir succeeds");
+ // FIXME: This test sometimes fails on Windows.
TEST_FALSE(runner, Folder_Exists(folder, foo),
"Dir is really gone");
@@ -395,6 +396,7 @@ test_Rename(TestBatchRunner *runner, set_up_t set_up, tear_down_t tear_down) {
"File still exists");
result = Folder_Rename(folder, foo_bar, foo_bar);
+ // FIXME: This test sometimes fails on Windows with "Permission denied".
TEST_TRUE(runner, result, "Renaming dir to itself succeeds");
TEST_TRUE(runner, Folder_Exists(folder, foo_bar),
"Dir still exists");
@@ -488,6 +490,7 @@ test_Hard_Link(TestBatchRunner *runner, set_up_t set_up, tear_down_t tear_down)
TEST_FALSE(runner, result, "Hard_Link dir fails");
TEST_FALSE(runner, Folder_Exists(folder, banana),
"Nothing at new path");
+ // FIXME: This test sometimes fails on Windows.
TEST_TRUE(runner, Folder_Exists(folder, baz),
"Folder still exists at old path");
Folder_Delete(folder, baz);
[2/3] lucy git commit: Regenerate charmonizer.c for Windows fix
Posted by nw...@apache.org.
Regenerate charmonizer.c for Windows fix
Project: http://git-wip-us.apache.org/repos/asf/lucy/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucy/commit/43428483
Tree: http://git-wip-us.apache.org/repos/asf/lucy/tree/43428483
Diff: http://git-wip-us.apache.org/repos/asf/lucy/diff/43428483
Branch: refs/heads/master
Commit: 4342848324359fb41bc3af196e169eca5e37fe80
Parents: d2c472a
Author: Nick Wellnhofer <we...@aevum.de>
Authored: Sun Jul 12 11:47:34 2015 +0200
Committer: Nick Wellnhofer <we...@aevum.de>
Committed: Sun Jul 12 11:47:34 2015 +0200
----------------------------------------------------------------------
common/charmonizer.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucy/blob/43428483/common/charmonizer.c
----------------------------------------------------------------------
diff --git a/common/charmonizer.c b/common/charmonizer.c
index 8c121a0..b05a383 100644
--- a/common/charmonizer.c
+++ b/common/charmonizer.c
@@ -5087,7 +5087,10 @@ chaz_MakeRule_add_command_with_libpath(chaz_MakeRule *rule,
path = chaz_Util_vjoin(";", args);
va_end(args);
- lib_command = chaz_Util_join("", "path ", path, ";%path% && ", command,
+ /* It's important to not add a space before `&&`. Otherwise, the
+ * space is added to the search path.
+ */
+ lib_command = chaz_Util_join("", "path ", path, ";%path%&& ", command,
NULL);
}
else {