aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/corelib/buildgraph/rulecommands.h
diff options
context:
space:
mode:
authorJochen Ulrich <jochenulrich@t-online.de>2019-07-08 00:10:04 +0200
committerJochen Ulrich <jochenulrich@t-online.de>2019-08-01 19:35:31 +0000
commit923f98062b4297970f382da91256c21d47b01a5e (patch)
treeef825940015e78e81acc1897339913f017af1d3b /src/lib/corelib/buildgraph/rulecommands.h
parent6a672fe58fe18b2f2e74c41048d4c15b8395440a (diff)
Add command and AutotestRunner timeout
Task-number: QBS-1454 Change-Id: I6e2514d10cca0cba0a14456ecd2abfb495539ee4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io> Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Diffstat (limited to 'src/lib/corelib/buildgraph/rulecommands.h')
-rw-r--r--src/lib/corelib/buildgraph/rulecommands.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/lib/corelib/buildgraph/rulecommands.h b/src/lib/corelib/buildgraph/rulecommands.h
index d9d561454..d4d70d591 100644
--- a/src/lib/corelib/buildgraph/rulecommands.h
+++ b/src/lib/corelib/buildgraph/rulecommands.h
@@ -1,6 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2019 Jochen Ulrich <jochenulrich@t-online.de>
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qbs.
@@ -70,6 +71,7 @@ public:
static QString defaultHighLight() { return {}; }
static bool defaultIgnoreDryRun() { return false; }
static bool defaultIsSilent() { return false; }
+ static int defaultTimeout() { return -1; }
virtual CommandType type() const = 0;
virtual bool equals(const AbstractCommand *other) const;
@@ -83,6 +85,7 @@ public:
bool isSilent() const { return m_silent; }
QString jobPool() const { return m_jobPool; }
CodeLocation codeLocation() const { return m_codeLocation; }
+ int timeout() const { return m_timeout; }
const QVariantMap &properties() const { return m_properties; }
@@ -100,7 +103,7 @@ private:
{
pool.serializationOp<opType>(m_description, m_extendedDescription, m_highlight,
m_ignoreDryRun, m_silent, m_codeLocation, m_jobPool,
- m_properties);
+ m_timeout, m_properties);
}
QString m_description;
@@ -110,6 +113,7 @@ private:
bool m_silent;
CodeLocation m_codeLocation;
QString m_jobPool;
+ int m_timeout;
QVariantMap m_properties;
};