From 00683f2c47458756e396279a0efb66b86bb0c7b3 Mon Sep 17 00:00:00 2001 From: tezeb Date: Thu, 2 Mar 2017 16:14:19 +0100 Subject: Codecov working --- .codecov.yml | 3 +++ .travis.yml | 12 ++++-------- qtpass.pri | 11 +++++++++++ qtpass.pro | 24 +++++++++++++++++++++++- src/src.pro | 7 +++---- tests/auto/auto.pri | 2 ++ tests/auto/util/util.pro | 19 +++++++++++-------- tests/tests.pri | 3 +-- tests/tests.pro | 4 ++-- 9 files changed, 60 insertions(+), 25 deletions(-) create mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 00000000..db333ac5 --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,3 @@ +coverage: + ignore: + - tests/* diff --git a/.travis.yml b/.travis.yml index efe5aed9..cce4ac15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,11 +30,12 @@ install: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then npm install -g appdmg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt58base qt58tools qt58svg; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user codecov; fi before_script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt58/bin/qt58-env.sh; fi script: - qmake -v -- qmake -Wall qtpass.pro +- qmake CONFIG+=debug -Wall qtpass.pro - make -j$(nproc) - if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/QtPass.app; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi @@ -43,13 +44,8 @@ script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pri | cut -d " " -f 6).dmg; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pri | cut -d " " -f 6); fi -- export QT_QPA_PLATFORM=offscreen -- cd tests -- qmake -- make -- if [ "$TRAVIS_OS_NAME" != "osx" ]; then ./auto/util/tst_util; fi -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then ./auto/util/tst_util.app/Contents/MacOS/tst_util; fi -- cd - +- if [ "$TRAVIS_OS_NAME" = "osx" ]; then make -j$(nproc) check ; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc) codecov TESTARGS="--platform offscreen"; fi notifications: irc: channels: diff --git a/qtpass.pri b/qtpass.pri index 38a0b33f..05ce49e2 100644 --- a/qtpass.pri +++ b/qtpass.pri @@ -1,2 +1,13 @@ VERSION = 1.2.0-pre +TEMPLATE = subdirs + +CONFIG(debug, debug|release) { + DESTDIR = debug + OBJECTS_DIR = debug + MOC_DIR = debug + QMAKE_CXXFLAGS += --coverage + QMAKE_LFLAGS += --coverage + QMAKE_DISTCLEAN += -r $$OBJECTS_DIR +} + diff --git a/qtpass.pro b/qtpass.pro index 0f059915..a0c499ae 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -1,9 +1,10 @@ -TEMPLATE = subdirs +!include(qtpass.pri) { error("Couldn't find the qtpass.pri file!") } SUBDIRS += src CONFIG(debug, debug|release) { SUBDIRS += tests + tests.depends = src } OTHER_FILES += LICENSE \ @@ -12,3 +13,24 @@ OTHER_FILES += LICENSE \ RESOURCES += resources.qrc +# add Makefile target to generate code coverage +coverage.target = coverage +coverage.commands = @echo "Coverage DONE!" $$escape_expand(\\n\\t) +coverage.commands += cd src/debug && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +coverage.commands += $$escape_expand(\\n) + +coverage.depends = check + +# add Makefile target to generate code coverage using codecov +codecov.target = codecov +codecov.commands = @echo "Starting Codecov!" $$escape_expand(\\n\\t) +coverage.commands += cd src/ && gcov "*.cpp *.h debug/*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +codecov.commands += codecov $$escape_expand(\\n\\t) +codecov.commands += $$escape_expand(\\n) + +codecov.depends = check + +CONFIG(debug, debug|release) { + QMAKE_EXTRA_TARGETS += coverage codecov + QMAKE_CLEAN += 'src/debug/*.gc??' 'src/*.gcov' +} diff --git a/src/src.pro b/src/src.pro index bfd2b678..041843ad 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,4 +1,4 @@ -!include(../qtpass.pri) { error("Couldn't find the auto.pri file!") } +!include(../qtpass.pri) { error("Couldn't find the qtpass.pri file!") } TEMPLATE = app QT += core gui @@ -8,9 +8,8 @@ CONFIG += c++11 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets CONFIG(debug, debug|release) { - QMAKE_CXXFLAGS += -g -c -Wall -coverage -O0 - QMAKE_LFLAGS += -coverage -O0 - SUBDIRS += tests + QMAKE_CXXFLAGS += -g -c -Wall -O0 + QMAKE_LFLAGS += -O0 } macx { diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index e391d44f..2c2ed402 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -1,3 +1,5 @@ !include(../tests.pri) { error("Couldn't find the tests.pri file!") } +TEMPLATE = app + !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 1c8ba7cf..54d78b18 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -1,14 +1,15 @@ !include(../auto.pri) { error("Couldn't find the auto.pri file!") } SOURCES += tst_util.cpp \ - util.cpp \ - qtpasssettings.cpp \ - settingsconstants.cpp \ - pass.cpp \ - realpass.cpp \ - imitatepass.cpp \ - executor.cpp \ - simpletransaction.cpp + +OBJECTS += ../../../src/$$OBJECTS_DIR/util.o \ + ../../../src/$$OBJECTS_DIR/qtpasssettings.o \ + ../../../src/$$OBJECTS_DIR/settingsconstants.o \ + ../../../src/$$OBJECTS_DIR/pass.o \ + ../../../src/$$OBJECTS_DIR/realpass.o \ + ../../../src/$$OBJECTS_DIR/imitatepass.o \ + ../../../src/$$OBJECTS_DIR/executor.o \ + ../../../src/$$OBJECTS_DIR/simpletransaction.o HEADERS += util.h \ qtpasssettings.h \ @@ -19,6 +20,8 @@ HEADERS += util.h \ executor.h \ simpletransaction.h +OBJ_PATH += ../../../src/$$OBJECTS_DIR + VPATH += ../../../src INCLUDEPATH += ../../../src diff --git a/tests/tests.pri b/tests/tests.pri index 951bc957..ae8302b2 100644 --- a/tests/tests.pri +++ b/tests/tests.pri @@ -1,8 +1,7 @@ -TEMPLATE = app +!include(../qtpass.pri) { error("Couldn't find the qtpass.pri file!") } CONFIG += testcase qt warn_on depend_includepath testcase QT += testlib widgets target.path = $$[QT_INSTALL_TESTS]/qtpass/$$TARGET INSTALLS += target - diff --git a/tests/tests.pro b/tests/tests.pro index 65126941..da7ad3ec 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -1,5 +1,5 @@ -QT += widgets testlib +!include(tests.pri) { error("Couldn't find the tests.pri file!") } + CONFIG += no_docs_target -TEMPLATE = subdirs SUBDIRS += auto exists(manual): SUBDIRS += manual -- cgit v1.2.3 From 1e1b9391dd183944011e59f5de47fa75f20ddfa4 Mon Sep 17 00:00:00 2001 From: tezeb Date: Fri, 10 Mar 2017 14:02:09 +0100 Subject: Run gcov manually --- .codecov.yml | 1 + qtpass.pro | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.codecov.yml b/.codecov.yml index db333ac5..76c9e644 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -1,3 +1,4 @@ coverage: ignore: - tests/* + - src/qrc_*.cpp diff --git a/qtpass.pro b/qtpass.pro index a0c499ae..83331fa7 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -15,7 +15,6 @@ RESOURCES += resources.qrc # add Makefile target to generate code coverage coverage.target = coverage -coverage.commands = @echo "Coverage DONE!" $$escape_expand(\\n\\t) coverage.commands += cd src/debug && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) coverage.commands += $$escape_expand(\\n) @@ -23,9 +22,8 @@ coverage.depends = check # add Makefile target to generate code coverage using codecov codecov.target = codecov -codecov.commands = @echo "Starting Codecov!" $$escape_expand(\\n\\t) -coverage.commands += cd src/ && gcov "*.cpp *.h debug/*.gcda" 1>/dev/null $$escape_expand(\\n\\t) -codecov.commands += codecov $$escape_expand(\\n\\t) +codecov.commands += cd src/ && gcov "*.cpp *.h debug/*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +codecov.commands += codecov -X gcov $$escape_expand(\\n\\t) codecov.commands += $$escape_expand(\\n) codecov.depends = check -- cgit v1.2.3 From 5cc0b28a3d2b0c3f73c16c502383cf7b15110750 Mon Sep 17 00:00:00 2001 From: tezeb Date: Fri, 10 Mar 2017 15:40:13 +0100 Subject: lcov target for offline code coverage --- qtpass.pro | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/qtpass.pro b/qtpass.pro index 83331fa7..1b8a81a8 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -13,22 +13,40 @@ OTHER_FILES += LICENSE \ RESOURCES += resources.qrc -# add Makefile target to generate code coverage -coverage.target = coverage -coverage.commands += cd src/debug && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) -coverage.commands += $$escape_expand(\\n) - -coverage.depends = check +# add Makefile target to generate code coverage using gcov +gcov.target = gcov +gcov.commands += cd src/debug && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +gcov.commands += $$escape_expand(\\n) +gcov.depends = check # add Makefile target to generate code coverage using codecov codecov.target = codecov -codecov.commands += cd src/ && gcov "*.cpp *.h debug/*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +codecov.commands += cd src/ && gcov -o debug *.cpp *.h debug/*.gcda 1>/dev/null $$escape_expand(\\n\\t) codecov.commands += codecov -X gcov $$escape_expand(\\n\\t) codecov.commands += $$escape_expand(\\n) - codecov.depends = check +LCOV_OUTPUT_DIR = src/$$OBJECTS_DIR/lcov/ +# add Makefile target to generate code coverage using lcov +lcov_initial.target = lcov_initial +#lcov_initial.commands = $$escape_expand(\\n\\t) +lcov_initial.commands += rm -rf $$LCOV_OUTPUT_DIR $$escape_expand(\\n\\t) +lcov_initial.commands += mkdir $$LCOV_OUTPUT_DIR $$escape_expand(\\n\\t) +lcov_initial.commands += lcov --quiet --initial --capture --base-directory ./src --directory ./src/debug/ -o $${LCOV_OUTPUT_DIR}/.lcov.base1 $$escape_expand(\\n\\t) +lcov_initial.commands += $$escape_expand(\\n) +lcov_initial.depends += sub-src + +lcov.target = lcov +lcov.commands += lcov -q -c -b ./src -d ./src/debug/ -o $${LCOV_OUTPUT_DIR}/.lcov.run1 $$escape_expand(\\n\\t) +lcov.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.base1 -o $${LCOV_OUTPUT_DIR}/.lcov.base $$PWD/src/* $$escape_expand(\\n\\t) +lcov.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.run1 -o $${LCOV_OUTPUT_DIR}/.lcov.run $$PWD/src/* $$escape_expand(\\n\\t) +lcov.commands += lcov -q -a $${LCOV_OUTPUT_DIR}/.lcov.base -a $${LCOV_OUTPUT_DIR}/.lcov.run -o $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) +lcov.commands += genhtml --demangle-cpp -o $${LCOV_OUTPUT_DIR}/ $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) +lcov.commands += @echo -e "xdg-open file:///$${PWD}/$${LCOV_OUTPUT_DIR}/index.html" +lcov.commands += $$escape_expand(\\n) +lcov.depends = lcov_initial check + CONFIG(debug, debug|release) { - QMAKE_EXTRA_TARGETS += coverage codecov + QMAKE_EXTRA_TARGETS += gcov codecov lcov lcov_initial QMAKE_CLEAN += 'src/debug/*.gc??' 'src/*.gcov' } -- cgit v1.2.3 From 0869c3dde588d2e7aac0e834d77d9fa1755b3bc2 Mon Sep 17 00:00:00 2001 From: tezeb Date: Fri, 10 Mar 2017 21:44:37 +0100 Subject: coverage on release build with coveralls --- .travis.yml | 13 +++++++++---- qtpass.pri | 8 +------- qtpass.pro | 41 +++++++++++++++++++++++------------------ src/src.pro | 4 ++++ 4 files changed, 37 insertions(+), 29 deletions(-) diff --git a/.travis.yml b/.travis.yml index cce4ac15..64532747 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,12 +31,19 @@ install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install qt58base qt58tools qt58svg; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pip install --user codecov; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then gem install coveralls-lcov ; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install lcov; fi before_script: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then source /opt/qt58/bin/qt58-env.sh; fi -script: - qmake -v -- qmake CONFIG+=debug -Wall qtpass.pro +script: +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then qmake CONFIG+=coverage -Wall qtpass.pro; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc); fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc) coveralls TESTARGS="--platform offscreen"; fi +- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make distclean; fi +- qmake -Wall qtpass.pro - make -j$(nproc) +- make check TESTARGS="--platform offscreen" - if [ "$TRAVIS_OS_NAME" = "osx" ]; then macdeployqt src/QtPass.app; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/FAQ\.md/https:\/\/qtpass.org\/docs\/md_FAQ.html/' < README.md > README.faq; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then sed 's/CONTRIBUTING\.md/https:\/\/qtpass.org\/docs\/md_CONTRIBUTING.html/' < README.faq > README.contrib; fi @@ -44,8 +51,6 @@ script: - if [ "$TRAVIS_OS_NAME" = "osx" ]; then pandoc --standalone --from=markdown_github --to=rtf --output=README.rtf README.clean; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then appdmg appdmg.json qtpass-$(grep ^VERSION qtpass.pri | cut -d " " -f 6).dmg; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then export VERSION=$(grep ^VERSION qtpass.pri | cut -d " " -f 6); fi -- if [ "$TRAVIS_OS_NAME" = "osx" ]; then make -j$(nproc) check ; fi -- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make -j$(nproc) codecov TESTARGS="--platform offscreen"; fi notifications: irc: channels: diff --git a/qtpass.pri b/qtpass.pri index 05ce49e2..3e89fe87 100644 --- a/qtpass.pri +++ b/qtpass.pri @@ -2,12 +2,6 @@ VERSION = 1.2.0-pre TEMPLATE = subdirs -CONFIG(debug, debug|release) { - DESTDIR = debug - OBJECTS_DIR = debug - MOC_DIR = debug - QMAKE_CXXFLAGS += --coverage +CONFIG(coverage) { QMAKE_LFLAGS += --coverage - QMAKE_DISTCLEAN += -r $$OBJECTS_DIR } - diff --git a/qtpass.pro b/qtpass.pro index 1b8a81a8..6d395496 100644 --- a/qtpass.pro +++ b/qtpass.pro @@ -1,11 +1,7 @@ !include(qtpass.pri) { error("Couldn't find the qtpass.pri file!") } -SUBDIRS += src - -CONFIG(debug, debug|release) { - SUBDIRS += tests - tests.depends = src -} +SUBDIRS += src tests +tests.depends = src OTHER_FILES += LICENSE \ README.md \ @@ -15,14 +11,13 @@ RESOURCES += resources.qrc # add Makefile target to generate code coverage using gcov gcov.target = gcov -gcov.commands += cd src/debug && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) +gcov.commands += cd src/$$OBJECTS_DIR && gcov "*.gcda" 1>/dev/null $$escape_expand(\\n\\t) gcov.commands += $$escape_expand(\\n) gcov.depends = check # add Makefile target to generate code coverage using codecov codecov.target = codecov -codecov.commands += cd src/ && gcov -o debug *.cpp *.h debug/*.gcda 1>/dev/null $$escape_expand(\\n\\t) -codecov.commands += codecov -X gcov $$escape_expand(\\n\\t) +codecov.commands += cd src/ && codecov $$escape_expand(\\n\\t) codecov.commands += $$escape_expand(\\n) codecov.depends = check @@ -32,21 +27,31 @@ lcov_initial.target = lcov_initial #lcov_initial.commands = $$escape_expand(\\n\\t) lcov_initial.commands += rm -rf $$LCOV_OUTPUT_DIR $$escape_expand(\\n\\t) lcov_initial.commands += mkdir $$LCOV_OUTPUT_DIR $$escape_expand(\\n\\t) -lcov_initial.commands += lcov --quiet --initial --capture --base-directory ./src --directory ./src/debug/ -o $${LCOV_OUTPUT_DIR}/.lcov.base1 $$escape_expand(\\n\\t) +lcov_initial.commands += lcov --quiet --initial --capture --base-directory ./src --directory ./src/$$OBJECTS_DIR/ -o $${LCOV_OUTPUT_DIR}/.lcov.base1 $$escape_expand(\\n\\t) lcov_initial.commands += $$escape_expand(\\n) lcov_initial.depends += sub-src +lcov_prepare.target = lcov_prepare +lcov_prepare.commands += lcov -q -c -b ./src -d ./src/$$OBJECTS_DIR/ -o $${LCOV_OUTPUT_DIR}/.lcov.run1 $$escape_expand(\\n\\t) +lcov_prepare.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.base1 -o $${LCOV_OUTPUT_DIR}/.lcov.base $$PWD/src/* $$escape_expand(\\n\\t) +lcov_prepare.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.run1 -o $${LCOV_OUTPUT_DIR}/.lcov.run $$PWD/src/* $$escape_expand(\\n\\t) +lcov_prepare.commands += lcov -q -a $${LCOV_OUTPUT_DIR}/.lcov.base -a $${LCOV_OUTPUT_DIR}/.lcov.run -o $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) +lcov_prepare.commands += $$escape_expand(\\n) +lcov_prepare.depends = lcov_initial check + lcov.target = lcov -lcov.commands += lcov -q -c -b ./src -d ./src/debug/ -o $${LCOV_OUTPUT_DIR}/.lcov.run1 $$escape_expand(\\n\\t) -lcov.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.base1 -o $${LCOV_OUTPUT_DIR}/.lcov.base $$PWD/src/* $$escape_expand(\\n\\t) -lcov.commands += lcov -q -e $${LCOV_OUTPUT_DIR}/.lcov.run1 -o $${LCOV_OUTPUT_DIR}/.lcov.run $$PWD/src/* $$escape_expand(\\n\\t) -lcov.commands += lcov -q -a $${LCOV_OUTPUT_DIR}/.lcov.base -a $${LCOV_OUTPUT_DIR}/.lcov.run -o $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) lcov.commands += genhtml --demangle-cpp -o $${LCOV_OUTPUT_DIR}/ $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) lcov.commands += @echo -e "xdg-open file:///$${PWD}/$${LCOV_OUTPUT_DIR}/index.html" lcov.commands += $$escape_expand(\\n) -lcov.depends = lcov_initial check +lcov.depends = lcov_prepare + +coveralls.target = coveralls +coveralls.commands += coveralls-lcov $${LCOV_OUTPUT_DIR}/.lcov.total $$escape_expand(\\n\\t) +coveralls.commands += $$escape_expand(\\n) +coveralls.depends = lcov_prepare -CONFIG(debug, debug|release) { - QMAKE_EXTRA_TARGETS += gcov codecov lcov lcov_initial - QMAKE_CLEAN += 'src/debug/*.gc??' 'src/*.gcov' +CONFIG(coverage) { + QMAKE_EXTRA_TARGETS += gcov codecov lcov_initial lcov_prepare lcov coveralls + QMAKE_CLEAN += src/$$OBJECTS_DIR/*.gc?? src/*.gcov + QMAKE_DISTCLEAN += -r src/$$OBJECTS_DIR/lcov/ } diff --git a/src/src.pro b/src/src.pro index 041843ad..5cf24593 100644 --- a/src/src.pro +++ b/src/src.pro @@ -12,6 +12,10 @@ CONFIG(debug, debug|release) { QMAKE_LFLAGS += -O0 } +CONFIG(coverage) { + QMAKE_CXXFLAGS += --coverage +} + macx { TARGET = QtPass QMAKE_MAC_SDK = macosx -- cgit v1.2.3 From e7163d8e63096a6f126969577a3622dcaa5df6d3 Mon Sep 17 00:00:00 2001 From: tezeb Date: Sun, 12 Mar 2017 13:49:39 +0100 Subject: fix for build with 'debug_and_release'(ie. Windows) --- tests/auto/util/util.pro | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 54d78b18..5a22d120 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -2,14 +2,14 @@ SOURCES += tst_util.cpp \ -OBJECTS += ../../../src/$$OBJECTS_DIR/util.o \ - ../../../src/$$OBJECTS_DIR/qtpasssettings.o \ - ../../../src/$$OBJECTS_DIR/settingsconstants.o \ - ../../../src/$$OBJECTS_DIR/pass.o \ - ../../../src/$$OBJECTS_DIR/realpass.o \ - ../../../src/$$OBJECTS_DIR/imitatepass.o \ - ../../../src/$$OBJECTS_DIR/executor.o \ - ../../../src/$$OBJECTS_DIR/simpletransaction.o +OBJECTS += ../../../src/$(OBJECTS_DIR)/util.o \ + ../../../src/$(OBJECTS_DIR)/qtpasssettings.o \ + ../../../src/$(OBJECTS_DIR)/settingsconstants.o \ + ../../../src/$(OBJECTS_DIR)/pass.o \ + ../../../src/$(OBJECTS_DIR)/realpass.o \ + ../../../src/$(OBJECTS_DIR)/imitatepass.o \ + ../../../src/$(OBJECTS_DIR)/executor.o \ + ../../../src/$(OBJECTS_DIR)/simpletransaction.o HEADERS += util.h \ qtpasssettings.h \ @@ -20,7 +20,7 @@ HEADERS += util.h \ executor.h \ simpletransaction.h -OBJ_PATH += ../../../src/$$OBJECTS_DIR +OBJ_PATH += ../../../src/$(OBJECTS_DIR) VPATH += ../../../src INCLUDEPATH += ../../../src -- cgit v1.2.3 From 92201dcba871b43ce495798a7a580d97f60d162a Mon Sep 17 00:00:00 2001 From: tezeb Date: Sun, 12 Mar 2017 13:56:05 +0100 Subject: run make check on appveyor --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index b2b00b59..086f8175 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -12,7 +12,7 @@ build_script: - cmd: cd tests - qmake - mingw32-make - - cmd: auto\util\release\tst_util.exe + - mingw32-make check artifacts: - path: Output\qtpass-*.exe - path: src\release\qtpass.exe -- cgit v1.2.3 From ed5cc364453a002812e32dea7c0f28fe4eb53085 Mon Sep 17 00:00:00 2001 From: tezeb Date: Sun, 12 Mar 2017 14:03:20 +0100 Subject: Workaround for failing test building for Windows --- .appveyor.yml | 5 +---- tests/auto/util/util.pro | 7 +++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 086f8175..f262442f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -5,14 +5,11 @@ install: build_script: - qmake qtpass.pro CONFIG+=static - mingw32-make + - mingw32-make check #after_build: - cmd: copy README.md src\release\README.txt - cmd: copy LICENSE src\release\LICENSE.txt - iscc qtpass.iss - - cmd: cd tests - - qmake - - mingw32-make - - mingw32-make check artifacts: - path: Output\qtpass-*.exe - path: src\release\qtpass.exe diff --git a/tests/auto/util/util.pro b/tests/auto/util/util.pro index 5a22d120..7e9c582a 100644 --- a/tests/auto/util/util.pro +++ b/tests/auto/util/util.pro @@ -1,5 +1,7 @@ !include(../auto.pri) { error("Couldn't find the auto.pri file!") } +message($$QMAKE_LINK_OBJECT_MAX) + SOURCES += tst_util.cpp \ OBJECTS += ../../../src/$(OBJECTS_DIR)/util.o \ @@ -27,4 +29,9 @@ INCLUDEPATH += ../../../src win32 { LIBS += -lbcrypt + RC_FILE = ../../../windows.rc +# temporary workaround for QTBUG-6453 + QMAKE_LINK_OBJECT_MAX=24 +# setting this may also work, but I can't find appropriate value right now +# QMAKE_LINK_OBJECT_SCRIPT = } -- cgit v1.2.3