Travis: Try to reactivate the gui/test tests

.travis.yml

@@ -237,13 +237,13 @@ script:
   - make -s -j2
   - cd ../
 # Build gui/test
-#  - cd gui/test
+  - cd gui/test
-#  - qmake
+  - qmake
-#  - make
+  - make
-#  - filelist/test-filelist
+  - filelist/test-filelist
-#  - projectfile/test-projectfile
+  - projectfile/test-projectfile
-#  - xmlreportv2/test-xmlreportv2
+  - xmlreportv2/test-xmlreportv2
-#  - cd ../..
+  - cd ../..
 # Build triage
   - cd ./tools/triage
   - git clean -dfx .

gui/test/common.pri

@@ -1,28 +1,7 @@
 QT += testlib
 
-INCLUDEPATH += $${PWD}/..
+INCLUDEPATH += $${PWD}/.. \
-
+    $${PWD}/../../lib
-LIBS += -L$$PWD/../../externals
-INCLUDEPATH += $${PWD}/../../externals
-
-include($${PWD}/../../lib/lib.pri)
-
-# GUI
-SOURCES += $${PWD}/../erroritem.cpp \
-    $${PWD}/../filelist.cpp \
-    $${PWD}/../projectfile.cpp \
-    $${PWD}/../report.cpp \
-    $${PWD}/../translationhandler.cpp \
-    $${PWD}/../xmlreport.cpp \
-    $${PWD}/../xmlreportv2.cpp
-
-HEADERS += $${PWD}/../erroritem.h \
-    $${PWD}/../filelist.h \
-    $${PWD}/../projectfile.h \
-    $${PWD}/../report.h \
-    $${PWD}/../translationhandler.h \
-    $${PWD}/../xmlreport.h \
-    $${PWD}/../xmlreportv2.h
 
 contains(QMAKE_CC, gcc) {
     QMAKE_CXXFLAGS += -std=c++11

gui/test/filelist/filelist.pro

@@ -1,16 +1,22 @@
 TEMPLATE = app
 TARGET = test-filelist
 DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../../externals/simplecpp
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 QT += testlib
 
 include(../common.pri)
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
 # tests
-SOURCES += testfilelist.cpp
+SOURCES += testfilelist.cpp \
+    ../../filelist.cpp \
+    ../../../lib/pathmatch.cpp \
+    ../../../lib/path.cpp \
+    ../../../externals/simplecpp/simplecpp.cpp
 
-HEADERS += testfilelist.h
+HEADERS += testfilelist.h \
+    ../../filelist.h \
+    ../../../lib/pathmatch.h \
+    ../../../lib/path.h \
+    ../../../externals/simplecpp/simplecpp.h

gui/test/projectfile/projectfile.pro

@@ -7,9 +7,9 @@ MOC_DIR = ../build
 
 include(../common.pri)
 
-DEFINES += SRCDIR=\\\"$$PWD\\\"
-
 # tests
-SOURCES += testprojectfile.cpp
+SOURCES += testprojectfile.cpp \
+    ../../projectfile.cpp
 
-HEADERS += testprojectfile.h
+HEADERS += testprojectfile.h \
+    ../../projectfile.h

gui/test/test.pro

@@ -3,8 +3,7 @@
 CONFIG  += ordered
 TEMPLATE = subdirs
 
-SUBDIRS = benchmark \
+SUBDIRS = \
     filelist \
     projectfile \
-    translationhandler \
     xmlreportv2

gui/test/xmlreportv2/xmlreportv2.pro

@@ -1,15 +1,24 @@
 TEMPLATE = app
 TARGET = test-xmlreportv2
 DEPENDPATH += .
-INCLUDEPATH += .
+INCLUDEPATH += . ../../../externals/simplecpp ../../../externals/tinyxml
 OBJECTS_DIR = ../build
 MOC_DIR = ../build
 
 include(../common.pri)
+include(../../../lib/lib.pri)
 
 DEFINES += SRCDIR=\\\"$$PWD\\\"
 
 # tests
-SOURCES += testxmlreportv2.cpp
+SOURCES += testxmlreportv2.cpp \
+    ../../erroritem.cpp \
+    ../../report.cpp \
+    ../../xmlreport.cpp \
+    ../../xmlreportv2.cpp
 
-HEADERS += testxmlreportv2.h
+HEADERS += testxmlreportv2.h \
+    ../../erroritem.h \
+    ../../report.h \
+    ../../xmlreport.cpp \
+    ../../xmlreportv2.h