summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-11-17 15:07:25 +0100
committerErik Verbruggen <erik.verbruggen@theqtcompany.com>2015-11-18 12:16:46 +0000
commit1067fef8e5a7f70bf30dde603322fc1efb24c448 (patch)
tree0a00e2fff70b68f52c84461de7b6bd13ba5f2978 /tests
parent03db7bca027b03a18b78cbb48995250c16ece013 (diff)
Revert "Fix routing delayed events"
This reverts commit edbe5301ec1789081ce17d853e176e7c7fb90014. The patch relies on an export that is only available in "developer mode" (QFreeListDefaultConstants used by QFreeList, which is the type of delayedEventIdFreeList in QStateMachinePrivate). Change-Id: I3a48949bbe98edd8dc593ef047f3e93b70acb4dd Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/scion/tst_scion.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/scion/tst_scion.cpp b/tests/auto/scion/tst_scion.cpp
index 98a624a..f6aa511 100644
--- a/tests/auto/scion/tst_scion.cpp
+++ b/tests/auto/scion/tst_scion.cpp
@@ -31,7 +31,7 @@
Q_DECLARE_METATYPE(std::function<QScxmlStateMachine *()>);
-enum { SpyWaitTime = 12000 };
+enum { SpyWaitTime = 8000 };
static QSet<QString> weFailOnThese = QSet<QString>()
// The following test needs manual inspection of the result. However, note that we do not support multiple identical keys for event data.
@@ -47,6 +47,8 @@ static QSet<QString> weFailOnThese = QSet<QString>()
// Currently we do not support loading data as XML content inside the <data> tag.
<< QLatin1String("w3c-ecma/test557.txml")
+ // A nested state machine is used, which we do not support.
+ << QLatin1String("w3c-ecma/test187.txml")
// The following test uses the undocumented "exmode" attribute.
<< QLatin1String("w3c-ecma/test441a.txml")
// The following test needs manual inspection of the result. However, note that we do not support the undocumented "exmode" attribute.
@@ -62,9 +64,9 @@ static QSet<QString> differentSemantics = QSet<QString>()
<< QLatin1String("w3c-ecma/test329.txml")
// Qt does not support forcing initial states that are not marked as such.
<< QLatin1String("w3c-ecma/test413.txml") // FIXME: verify initial state setting...
- << QLatin1String("w3c-ecma/test576.txml") // FIXME: verify initial state setting...
// Scion apparently sets <data> values without a src/expr attribute to 0. We set it to undefined, as specified in B.2.1.
<< QLatin1String("w3c-ecma/test456.txml") // replaced by modified_test456
+ << QLatin1String("w3c-ecma/test576.txml")
// FIXME: qscxmlc fails on improper scxml file, currently no way of testing it properly for compiled case
<< QLatin1String("w3c-ecma/test301.txml")
// FIXME: Currently we do not support loading scripts from a srcexpr.