From 99c8710c68d6008428f45f3730846db2e7143d71 Mon Sep 17 00:00:00 2001
From: "J. Rassi" <rassi@10gen.com>
Date: Fri, 20 May 2016 12:10:25 -0400
Subject: SERVER-24195 collator_interface_icu_test needs ICU headers

---
 src/mongo/db/query/collation/SConscript            | 22 ++++++++++++----------
 .../collation/collator_interface_icu_test.cpp      |  1 +
 2 files changed, 13 insertions(+), 10 deletions(-)

(limited to 'src/mongo/db/query/collation')

diff --git a/src/mongo/db/query/collation/SConscript b/src/mongo/db/query/collation/SConscript
index ff2fd28e387..adf466cf7d9 100644
--- a/src/mongo/db/query/collation/SConscript
+++ b/src/mongo/db/query/collation/SConscript
@@ -123,16 +123,6 @@ env.CppUnitTest(
     ],
 )
 
-env.CppUnitTest(
-    target="collator_interface_icu_test",
-    source=[
-        "collator_interface_icu_test.cpp",
-    ],
-    LIBDEPS=[
-        "collator_icu",
-    ],
-)
-
 env.CppUnitTest(
     target="collator_factory_icu_test",
     source=[
@@ -143,6 +133,8 @@ env.CppUnitTest(
     ],
 )
 
+# The collator_icu library and the collator_interface_icu_test unit tests need an environment which
+# has access to the third-party ICU headers.
 icuEnv = env.Clone()
 
 if not use_system_version_of_library("icu"):
@@ -188,3 +180,13 @@ icuEnv.Library(
         "collator_factory_interface",
     ],
 )
+
+icuEnv.CppUnitTest(
+    target="collator_interface_icu_test",
+    source=[
+        "collator_interface_icu_test.cpp",
+    ],
+    LIBDEPS=[
+        "collator_icu",
+    ],
+)
diff --git a/src/mongo/db/query/collation/collator_interface_icu_test.cpp b/src/mongo/db/query/collation/collator_interface_icu_test.cpp
index db8d3021275..a367272615b 100644
--- a/src/mongo/db/query/collation/collator_interface_icu_test.cpp
+++ b/src/mongo/db/query/collation/collator_interface_icu_test.cpp
@@ -32,6 +32,7 @@
 
 #include <iomanip>
 #include <iostream>
+#include <unicode/coll.h>
 
 #include "mongo/unittest/unittest.h"
 
-- 
cgit v1.2.1