diff options
| -rw-r--r-- | include/dicealias.h (renamed from dicealias.h) | 0 | ||||
| -rw-r--r-- | include/diceparser.h (renamed from diceparser.h) | 0 | ||||
| -rw-r--r-- | include/diceparserhelper.h | 4 | ||||
| -rw-r--r-- | include/highlightdice.h (renamed from highlightdice.h) | 0 | ||||
| -rw-r--r-- | include/parsingtoolbox.h (renamed from parsingtoolbox.h) | 0 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/dice/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | tests/dice/Dice.pro | 25 | ||||
| -rw-r--r-- | tests/dice/testnode.cpp (renamed from tests/testnode.cpp) | 0 | ||||
| -rw-r--r-- | tests/dice/testnode.h (renamed from tests/testnode.h) | 0 | ||||
| -rw-r--r-- | tests/dice/tst_dice.cpp (renamed from tests/tst_dice.cpp) | 0 |
11 files changed, 9 insertions, 47 deletions
diff --git a/dicealias.h b/include/dicealias.h index 463a654..463a654 100644 --- a/dicealias.h +++ b/include/dicealias.h diff --git a/diceparser.h b/include/diceparser.h index 8ecfb50..8ecfb50 100644 --- a/diceparser.h +++ b/include/diceparser.h diff --git a/include/diceparserhelper.h b/include/diceparserhelper.h new file mode 100644 index 0000000..4f53293 --- /dev/null +++ b/include/diceparserhelper.h @@ -0,0 +1,4 @@ +#ifndef DICEPARSERHELPER_H +#define DICEPARSERHELPER_H + +#endif // DICEPARSERHELPER_H diff --git a/highlightdice.h b/include/highlightdice.h index 2e8f08a..2e8f08a 100644 --- a/highlightdice.h +++ b/include/highlightdice.h diff --git a/parsingtoolbox.h b/include/parsingtoolbox.h index b91db1a..b91db1a 100644 --- a/parsingtoolbox.h +++ b/include/parsingtoolbox.h diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt deleted file mode 100644 index 4065cc5..0000000 --- a/tests/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra") -set(CMAKE_AUTOMOC ON) -find_package(Qt5Test REQUIRED) - -set(test_source testnode.cpp tst_dice.cpp) - -add_executable(test_dice ${test_source} ) -target_link_libraries(test_dice diceparser Qt5::Test) -add_test(tst_diceparser test_dice) diff --git a/tests/dice/CMakeLists.txt b/tests/dice/CMakeLists.txt index a0f27fd..4065cc5 100644 --- a/tests/dice/CMakeLists.txt +++ b/tests/dice/CMakeLists.txt @@ -1,17 +1,9 @@ -cmake_minimum_required(VERSION 3.5) -project(tst_diceParser) - -enable_testing(true) - -# Tell CMake to run moc when necessary: +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra") set(CMAKE_AUTOMOC ON) - -# As moc files are generated in the binary dir, tell CMake -# to always look for includes there: -set(CMAKE_INCLUDE_CURRENT_DIR ON) - find_package(Qt5Test REQUIRED) -add_test(tst_diceParser tst_dice.cpp) +set(test_source testnode.cpp tst_dice.cpp) -target_link_libraries(foo Qt5::Test) +add_executable(test_dice ${test_source} ) +target_link_libraries(test_dice diceparser Qt5::Test) +add_test(tst_diceparser test_dice) diff --git a/tests/dice/Dice.pro b/tests/dice/Dice.pro deleted file mode 100644 index 9d24f91..0000000 --- a/tests/dice/Dice.pro +++ /dev/null @@ -1,25 +0,0 @@ -include(../tests.pri) - -SOURCES += \ - tst_dice.cpp - -TEMPLATE = app -TARGET= tst_diceParser -MOC_DIR=trash -OBJECTS_DIR=trash - -CONFIG+=testcase - -QT += testlib quick qml widgets - -INCLUDEPATH += $$ROLISTEAMSRC/diceparser/ -INCLUDEPATH += $$ROLISTEAMSRC/diceparser/node -INCLUDEPATH += $$ROLISTEAMSRC/diceparser/result - - -include($$ROLISTEAMSRC/diceparser/diceparser.pri) - -HEADERS -= ../../../rolisteam/client/diceparser/qmltypesregister.h -SOURCES -= ../../../rolisteam/client/diceparser/qmltypesregister.cpp - - diff --git a/tests/testnode.cpp b/tests/dice/testnode.cpp index de9fc05..de9fc05 100644 --- a/tests/testnode.cpp +++ b/tests/dice/testnode.cpp diff --git a/tests/testnode.h b/tests/dice/testnode.h index 5c918ee..5c918ee 100644 --- a/tests/testnode.h +++ b/tests/dice/testnode.h diff --git a/tests/tst_dice.cpp b/tests/dice/tst_dice.cpp index 1fe2641..1fe2641 100644 --- a/tests/tst_dice.cpp +++ b/tests/dice/tst_dice.cpp |