X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Ftest.cxx;h=36fb3b44218e29f90c791a7ae91afaef36cb306b;hb=dfee3a7d828b09c19ab3c03db17be627b952dcd7;hp=596fe3d8e4735fb5cbf33f30b3baef55ec6ce966;hpb=48970b341025a501ca17b991e9a5d0ee7995ec30;p=frida%2Ffrida.git

diff --git a/src/test.cxx b/src/test.cxx
index 596fe3d..36fb3b4 100644
--- a/src/test.cxx
+++ b/src/test.cxx
@@ -1,14 +1,20 @@
 #include <gtest/gtest.h>
+#include "log4cxx/logger.h"
+#include "log4cxx/basicconfigurator.h"
+#include <QApplication>
+#include "Config.hxx"
 
-char* TEST_DATA_DIRECTORY;
+const char* TEST_DATA_DIRECTORY;
 
 int main(int argc, char **argv) {
-  testing::InitGoogleTest(&argc, argv);
+	testing::InitGoogleTest(&argc, argv);
+	log4cxx::BasicConfigurator::configure();
 
-  if (argc > 1)
-	  TEST_DATA_DIRECTORY = argv[1];
-  else
-	  TEST_DATA_DIRECTORY = "./";
+	QApplication::addLibraryPath(CONFIG_LIBDIR);
+	if (argc > 1)
+		TEST_DATA_DIRECTORY = argv[1];
+	else
+		TEST_DATA_DIRECTORY = "./testdata";
 
-  return RUN_ALL_TESTS();
+	return RUN_ALL_TESTS();
 }