X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Ftest.cxx;h=ea8c47389d023e9c9d66c517294492c24d6aae5e;hp=9f73274dc04cbbe0c82a47c0f978fc7519d3a69b;hb=HEAD;hpb=914bc03c4ed200f495288d8483f4b9909368b4fd

diff --git a/src/test.cxx b/src/test.cxx
index 9f73274..ea8c473 100644
--- a/src/test.cxx
+++ b/src/test.cxx
@@ -3,18 +3,23 @@
 #include "log4cxx/basicconfigurator.h"
 #include <QApplication>
 #include "Config.hxx"
+#include "core/Settings.hxx"
 
-char* TEST_DATA_DIRECTORY;
+const char* TEST_DATA_DIRECTORY;
 
 int main(int argc, char **argv) {
 	testing::InitGoogleTest(&argc, argv);
 	log4cxx::BasicConfigurator::configure();
 
+	log4cxx::LevelPtr level = log4cxx::Level::getError();
+	log4cxx::Logger::getRootLogger()->setLevel(level);
+
 	QApplication::addLibraryPath(CONFIG_LIBDIR);
+	Settings settings;
 	if (argc > 1)
 		TEST_DATA_DIRECTORY = argv[1];
 	else
-		TEST_DATA_DIRECTORY = "./";
+		TEST_DATA_DIRECTORY = "./testdata";
 
 	return RUN_ALL_TESTS();
 }