onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-03-20 10:17:16 +01:00
Code Issues Releases Wiki Activity

Fixed #931 again. Some work on make tests target

Browse Source
This commit is contained in:
Roman Bovsunivskiy 2009-12-19 17:19:38 +00:00
parent 39f9c1bf40
commit 922c8bae7c
4 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fwbuilder3.pro
View File

@ -5,3 +5,7 @@ TEMPLATE = subdirs
SUBDIRS = src doc SUBDIRS = src doc
tests.commands = cd src && cd compiler_lib && cd unit_tests && qmake && make run; \
cd .. && cd .. && cd gui && unit_tests && qmake && make run
QMAKE_EXTRA_TARGETS += tests

4
src/gui/ObjectManipulator.cpp
View File

@ -709,8 +709,8 @@ void ObjectManipulator::contextMenuRequested(const QPoint &pos)
} }
} }
} else canCreateCluster = false; } else canCreateCluster = false;
if (canCreateCluster) //if (canCreateCluster)
popup_menu->addAction( tr("New cluster from selected firewalls"), this, SLOT( newClusterFromSelected() ) ); popup_menu->addAction( tr("New cluster from selected firewalls"), this, SLOT( newClusterFromSelected() ) )->setEnabled(canCreateCluster);
popup_menu->addSeparator(); popup_menu->addSeparator();
popup_menu->addAction( tr("Compile"), this, SLOT( compile())); popup_menu->addAction( tr("Compile"), this, SLOT( compile()));
popup_menu->addAction( tr("Install"), this, SLOT( install())); popup_menu->addAction( tr("Install"), this, SLOT( install()));

4
src/gui/unit_tests/ImporterTest/main.cpp
View File

@ -34,9 +34,9 @@
int fwbdebug = 0; int fwbdebug = 0;
//QString user_name; //QString user_name;
int main( int, char** ) int main( int, char** args)
{ {
init(); init(args);
CppUnit::TextUi::TestRunner runner; CppUnit::TextUi::TestRunner runner;
runner.addTest( ImporterTest::suite() ); runner.addTest( ImporterTest::suite() );
runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(), runner.setOutputter( new CppUnit::CompilerOutputter( &runner.result(),

56
src/gui/unit_tests/unit_tests.pro
View File

@ -1,51 +1,7 @@
TEMPLATE = app run.commands = echo "Running tests..." && \
LANGUAGE = C++ cd FWBTree && qmake && make run; cd ..; \
cd ImporterTest && qmake && make run; cd ..; \
QMAKE_CXX = g++ cd RCS && qmake && make run; cd ..; \
cd UsageResolverTest && qmake && make run; cd ..;
HEADERS += ../../../config.h \
../RCS.h \
#../utils.h \
../global.h
SOURCES += unit_tests.cpp \
#../utils.cpp \
../RCS.cpp
#
include(../../../qmake.inc)
#
exists(../qmake.inc) {
include( ../qmake.inc)
}
INCLUDEPATH += ..
INCLUDEPATH += ../../../
#
#
#
#
TARGET = unit_tests
#
#unix {
# !macx {
# # }
#}
CONFIG -= release
CONFIG += debug
OBJECTS_DIR = .
QMAKE_CXXFLAGS += -g -fprofile-arcs -ftest-coverage -O0 $$CPPUNIT_CFLAGS
QMAKE_CLEAN = *.gc??
QMAKE_COPY = ../../install.sh -m 0755 -s
run.commands = echo "Running tests..." && ${TARGET} && \
echo "Running gcov..." && gcov ${SOURCES} >/dev/null 2>/dev/null && echo "OK" || echo "FAILED"
run.depends = all
QMAKE_EXTRA_TARGETS += run QMAKE_EXTRA_TARGETS += run