walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Make triage work with log-files from test-my-pr.py (#2468) 

* triage: Allow master as version

Log-files from test-my-pr.py shows "master" as version. Extend regexp to
match "master", and improve regexp handling slightly to avoid making
assumptions on the length of the version.

* triage: Show log-files when opening files

test-my-pr.py defaults to save output as "my_check_diff.log". Show
log-files by default to make it more convenient to check these files as
well.
This commit is contained in:
Rikard Falkeborn 2020-01-03 19:33:42 +01:00 committed by Daniel Marjamäki
parent 0e369edd8c
commit 41caf28c6f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/triage/mainwindow.cpp
View File

@ -20,7 +20,7 @@ const int MAX_ERRORS = 100;
MainWindow::MainWindow(QWidget *parent) : MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent), QMainWindow(parent),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
mVersionRe("^(your|head|1.[0-9][0-9]) .*"), mVersionRe("^(master|your|head|1.[0-9][0-9]) (.*)"),
hFiles{"*.hpp", "*.h", "*.hxx", "*.hh", "*.tpp", "*.txx"}, hFiles{"*.hpp", "*.h", "*.hxx", "*.hh", "*.tpp", "*.txx"},
srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"} srcFiles{"*.cpp", "*.cxx", "*.cc", "*.c++", "*.C", "*.c", "*.cl"}
{ {
@ -52,7 +52,7 @@ MainWindow::~MainWindow()
void MainWindow::loadFile() void MainWindow::loadFile()
{ {
ui->statusBar->clearMessage(); ui->statusBar->clearMessage();
const QString fileName = QFileDialog::getOpenFileName(this, tr("daca results file"), WORK_FOLDER, tr("Text files (*.txt);;All (*.*)")); const QString fileName = QFileDialog::getOpenFileName(this, tr("daca results file"), WORK_FOLDER, tr("Text files (*.txt *.log);;All (*.*)"));
if (fileName.isEmpty()) if (fileName.isEmpty())
return; return;
QFile file(fileName); QFile file(fileName);
@ -86,7 +86,7 @@ void MainWindow::load(QTextStream &textStream)
errorMessage.clear(); errorMessage.clear();
} else if (!url.isEmpty() && QRegExp(".*: (error|warning|style|note):.*").exactMatch(line)) { } else if (!url.isEmpty() && QRegExp(".*: (error|warning|style|note):.*").exactMatch(line)) {
if (mVersionRe.exactMatch(line)) { if (mVersionRe.exactMatch(line)) {
const QString version = line.mid(0, 4); const QString version = mVersionRe.cap(1);
if (versions.indexOf(version) < 0) if (versions.indexOf(version) < 0)
versions << version; versions << version;
} }
@ -216,7 +216,7 @@ void MainWindow::showResult(QListWidgetItem *item)
const QString url = lines[0]; const QString url = lines[0];
QString msg = lines[1]; QString msg = lines[1];
if (mVersionRe.exactMatch(msg)) if (mVersionRe.exactMatch(msg))
msg = msg.mid(5); msg = mVersionRe.cap(2);
const QString archiveName = url.mid(url.lastIndexOf("/") + 1); const QString archiveName = url.mid(url.lastIndexOf("/") + 1);
const int pos1 = msg.indexOf(":"); const int pos1 = msg.indexOf(":");
const int pos2 = msg.indexOf(":", pos1+1); const int pos2 = msg.indexOf(":", pos1+1);