Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cppcheck for openSUSE:Factory checked in at 2022-04-22 21:53:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cppcheck (Old) and /work/SRC/openSUSE:Factory/.cppcheck.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cppcheck" Fri Apr 22 21:53:35 2022 rev:24 rq:971910 version:2.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/cppcheck/cppcheck.changes 2022-03-26 22:31:50.146016874 +0100 +++ /work/SRC/openSUSE:Factory/.cppcheck.new.1538/cppcheck.changes 2022-04-22 21:54:14.178804770 +0200 @@ -1,0 +2,6 @@ +Tue Apr 19 13:30:47 UTC 2022 - Dirk M??ller <dmuel...@suse.com> + +- update to 2.7.5: + * Import Project: Fix problem with define value with space + +------------------------------------------------------------------- Old: ---- cppcheck-2.7.4.tar.gz New: ---- cppcheck-2.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cppcheck.spec ++++++ --- /var/tmp/diff_new_pack.JAlBka/_old 2022-04-22 21:54:14.670805330 +0200 +++ /var/tmp/diff_new_pack.JAlBka/_new 2022-04-22 21:54:14.674805334 +0200 @@ -17,7 +17,7 @@ Name: cppcheck -Version: 2.7.4 +Version: 2.7.5 Release: 0 Summary: A tool for static C/C++ code analysis License: GPL-3.0-or-later @@ -38,6 +38,7 @@ BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(libpcre) +ExcludeArch: %ix86 %arm Requires: python3-Pygments %description ++++++ cppcheck-2.7.4.tar.gz -> cppcheck-2.7.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cppcheck-2.7.4/gui/projectfiledialog.cpp new/cppcheck-2.7.5/gui/projectfiledialog.cpp --- old/cppcheck-2.7.4/gui/projectfiledialog.cpp 2022-03-25 06:58:59.000000000 +0100 +++ new/cppcheck-2.7.5/gui/projectfiledialog.cpp 2022-04-15 20:23:30.000000000 +0200 @@ -337,9 +337,6 @@ if (!mUI.mAddonMisra->isEnabled()) { mUI.mEditMisraFile->setEnabled(false); mUI.mBtnBrowseMisraFile->setEnabled(false); - } else if (misraFile.isEmpty()) { - mUI.mAddonMisra->setEnabled(false); - mUI.mAddonMisra->setText(mUI.mAddonMisra->text() + ' ' + tr("(no rule texts file)")); } mUI.mToolClangAnalyzer->setChecked(projectFile->getClangAnalyzer()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cppcheck-2.7.4/lib/importproject.cpp new/cppcheck-2.7.5/lib/importproject.cpp --- old/cppcheck-2.7.4/lib/importproject.cpp 2022-03-25 06:58:59.000000000 +0100 +++ new/cppcheck-2.7.5/lib/importproject.cpp 2022-04-15 20:23:30.000000000 +0200 @@ -413,7 +413,7 @@ for (const picojson::value& arg : obj["arguments"].get<picojson::array>()) { if (arg.is<std::string>()) { std::string str = arg.get<std::string>(); - if (str.find(" ") != std::string::npos) + if (str.find(" ") != std::string::npos && str.find("=\"") > str.find(" ")) str = "\"" + str + "\""; command += str + " "; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cppcheck-2.7.4/test/testimportproject.cpp new/cppcheck-2.7.5/test/testimportproject.cpp --- old/cppcheck-2.7.4/test/testimportproject.cpp 2022-03-25 06:58:59.000000000 +0100 +++ new/cppcheck-2.7.5/test/testimportproject.cpp 2022-04-15 20:23:30.000000000 +0200 @@ -61,6 +61,7 @@ TEST_CASE(importCompileCommands9); TEST_CASE(importCompileCommands10); // #10887: include path with space TEST_CASE(importCompileCommands11); // include path order + TEST_CASE(importCompileCommands12); // defines TEST_CASE(importCompileCommandsArgumentsSection); // Handle arguments section TEST_CASE(importCompileCommandsNoCommandSection); // gracefully handles malformed json TEST_CASE(importCppcheckGuiProject); @@ -307,6 +308,27 @@ ASSERT_EQUALS("/x/abc/", fs.includePaths.back()); } + void importCompileCommands12() const { // define + const char json[] = + R"([{ + "file": "1.c" , + "directory": "/x", + "arguments": [ + "cc", + "-D", + "X=1", + "-D", + "__VERSION__=\"IAR C/C++ Compiler V6.40.2.748 for Atmel AVR\"" + ] + }])"; + std::istringstream istr(json); + TestImporter importer; + ASSERT_EQUALS(true, importer.importCompileCommands(istr)); + ASSERT_EQUALS(1, importer.fileSettings.size()); + const ImportProject::FileSettings &fs = importer.fileSettings.front(); + ASSERT_EQUALS("X=1;__VERSION__=IAR C/C++ Compiler V6.40.2.748 for Atmel AVR", fs.defines); + } + void importCompileCommandsArgumentsSection() const { const char json[] = "[ { \"directory\": \"/tmp/\"," "\"arguments\": [\"gcc\", \"-c\", \"src.c\"],"