From b68bae1132b5dc5c8f55435c72cd48e24aa52ec9 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Tue, 1 Nov 2011 12:19:39 +0100 Subject: Added -datatags option to QTestLib (Note: This feature is ported from Qt 4.8. See the following commits: 01575deafb7d26ca2431374e92c6d71de96547c7 4866d1ba8afbab61e102942d1ea93b81fea053d6 ) Passing the -datatags option to a QTestLib program prints the available data tags to standard output. For completeness, the test case name is also printed at the start of each output line. (Although the file name is supposed to match the lower-case version of the test case name, this is currently not true in all cases (particularly not under tests/benchmarks/). Even if there was a script to enforce this convention, the -datatags option provides this information in a reliable way.) Data tags for each test function (f() in this case) are printed in four different ways depending on the presence of local and global data tags: Case 1: No tags: tst_MyTestCasetst_MyTestCase f Case 2: Local tags only: tst_MyTestCase f local tag 1 tst_MyTestCase f local tag 2 ... Case 3: Global tags only: tst_MyTestCase f __global__ global tag 1 tst_MyTestCase f __global__ global tag 2 ... Case 4: Local and global tags: tst_MyTestCase f local tag 1 __global__ global tag 1 tst_MyTestCase f local tag 2 __global__ global tag 1 ... tst_MyTestCase f local tag 1 __global__ global tag 2 tst_MyTestCase f local tag 2 __global__ global tag 2 ... ... Note that the string __global__ is assumed to be highly unlikely to occur in a data tag (if it does, an ambiguity results). Change-Id: Ib51aa0c3c32ad52e52ce519729292cf8f0ec5d50 Reviewed-by: Jason McDonald Reviewed-by: Sergio Ahumada --- src/testlib/qtestlog_p.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/testlib/qtestlog_p.h') diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h index 692a36a4e6..b2aa8c1890 100644 --- a/src/testlib/qtestlog_p.h +++ b/src/testlib/qtestlog_p.h @@ -93,9 +93,13 @@ public: static void setMaxWarnings(int max); + static void setPrintAvailableTagsMode(); + private: QTestLog(); ~QTestLog(); + + static bool printAvailableTags; }; QT_END_NAMESPACE -- cgit v1.2.3