diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-16 15:23:36 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-11-16 15:23:36 (GMT) |
| commit | ff8486f8326e214faa08eacc8e91b5333d68e912 (patch) | |
| tree | 2fd560a86cdd7e043c3cc6d317b9c232c670a7ed /mkspecs | |
| parent | 44b08536caa51700e6885bff90c2c3f9de699ad6 (diff) | |
| parent | 23f3c60c42ffc42acee823ba8041b9474cc15133 (diff) | |
| download | Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.zip Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.tar.gz Qt-ff8486f8326e214faa08eacc8e91b5333d68e912.tar.bz2 | |
Merge remote-tracking branch 'mainline/4.8'
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/testcase.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/unix/gdb_dwarf_index.prf | 12 |
2 files changed, 14 insertions, 2 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 7a7c9e3..eb0aa9f 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -38,6 +38,10 @@ embedded: check.commands += -qws # Allow for custom arguments to tests check.commands += $(TESTARGS) + +# If the test is marked as insignificant, discard the exit code +insignificant_test:check.commands = -$${check.commands} + QMAKE_EXTRA_TARGETS *= check !debug_and_release|build_pass { diff --git a/mkspecs/features/unix/gdb_dwarf_index.prf b/mkspecs/features/unix/gdb_dwarf_index.prf index 14db4fc..e3f79cd 100644 --- a/mkspecs/features/unix/gdb_dwarf_index.prf +++ b/mkspecs/features/unix/gdb_dwarf_index.prf @@ -1,8 +1,16 @@ !CONFIG(separate_debug_info):CONFIG(debug, debug|release):!staticlib:!static:!contains(TEMPLATE, subdirs):!isEmpty(QMAKE_OBJCOPY) { - QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && \ + contains(TEMPLATE, "lib") { + QMAKE_GDB_INDEX = { test -z \"$(DESTDIR)\" || cd \"$(DESTDIR)\"; } && + QMAKE_GDB_DIR = . + } else { + QMAKE_GDB_INDEX = { test -n \"$(DESTDIR)\" && DESTDIR=\"$(DESTDIR)\" || DESTDIR=.; } && + QMAKE_GDB_DIR = \$\$DESTDIR + } + + QMAKE_GDB_INDEX += \ test \$\$(gdb --version | sed -e \'s,[^0-9]\\+\\([0-9]\\)\\.\\([0-9]\\).*,\\1\\2,;q\') -gt 72 && \ - gdb --nx --batch --quiet -ex \'set confirm off\' -ex \'save gdb-index .\' -ex quit \'$(TARGET)\' && \ + gdb --nx --batch --quiet -ex \'set confirm off\' -ex \"save gdb-index $$QMAKE_GDB_DIR\" -ex quit \'$(TARGET)\' && \ test -f $(TARGET).gdb-index && \ $$QMAKE_OBJCOPY --add-section \'.gdb_index=$(TARGET).gdb-index\' --set-section-flags \'.gdb_index=readonly\' \'$(TARGET)\' \'$(TARGET)\' && \ $$QMAKE_DEL_FILE $(TARGET).gdb-index || true |