v0.2.53..v0.2.54 changeset ConflateCaseTestSuite.cpp

diff --git a/hoot-core-test/src/test/cpp/hoot/core/test/ConflateCaseTestSuite.cpp b/hoot-core-test/src/test/cpp/hoot/core/test/ConflateCaseTestSuite.cpp
index 58705de..a363824 100644
--- a/hoot-core-test/src/test/cpp/hoot/core/test/ConflateCaseTestSuite.cpp
+++ b/hoot-core-test/src/test/cpp/hoot/core/test/ConflateCaseTestSuite.cpp
@@ -32,6 +32,7 @@
 #include <hoot/core/test/ConflateCaseTest.h>
 #include <hoot/core/util/HootException.h>
 #include <hoot/core/util/Log.h>
+#include <hoot/core/util/ConfPath.h>
 
 // Qt
 #include <QDir>
@@ -121,6 +122,10 @@ void ConflateCaseTestSuite::loadDir(const QString& dir, QStringList confs)
   }
   else
   {
+    // We require that all tests use Testing.conf. We want to load it first in order to give each
+    // test a chance to override it when necessary.
+    confs.prepend(ConfPath::search("Testing.conf"));
+
     addTest(new ConflateCaseTest(d, confs));
     _numTests++;
   }