Merge branch 'master-upstream'

2 files changed, 36 insertions, 1 deletions

diff --git a/tests/auto/lancelot/scripts/hinting.qps b/tests/auto/lancelot/scripts/hinting.qps
new file mode 100644
index 0000000..7ce21b2
--- /dev/null
+++ b/tests/auto/lancelot/scripts/hinting.qps
@@ -0,0 +1,26 @@
+translate 10 50
+setFont "sansserif" 10
+drawText 0 0 "Default hinting:"
+setFont "times" 12 normal normal default
+drawText 0 20 "The quick brown fox jumps over the lazy dog"
+
+translate 0 50
+setFont "sansserif" 10
+drawText 0 0 "No hinting:"
+setFont "times" 12 normal normal none
+drawText 0 20 "The quick brown fox jumps over the lazy dog"
+
+translate 0 50
+setFont "sansserif" 10
+drawText 0 0 "Vertical hinting:"
+setFont "times" 12 normal normal vertical
+drawText 0 20 "The quick brown fox jumps over the lazy dog"
+
+translate 0 50
+setFont "sansserif" 10
+drawText 0 0 "Full hinting:"
+setFont "times" 12 normal normal full
+drawText 0 20 "The quick brown fox jumps over the lazy dog"
+
+
+# Note: there is also the textlayout_draw command which might be interesting here.
diff --git a/tests/auto/lancelot/tst_lancelot.cpp b/tests/auto/lancelot/tst_lancelot.cpp
index e515c48..9721665 100644
--- a/tests/auto/lancelot/tst_lancelot.cpp
+++ b/tests/auto/lancelot/tst_lancelot.cpp
@@ -239,11 +239,20 @@ void tst_Lancelot::runTestSuite(GraphicsEngine engine, QImage::Format format)
         QSKIP("Blacklisted by baseline server.", SkipSingle);
 
     ImageItem rendered = render(baseline, engine, format);
+    static int consecutiveErrs = 0;
     if (rendered.image.isNull()) {    // Assume an error in the test environment, not Qt
         QWARN("Error: Failed to render image.");
-        QSKIP("Aborted due to errors.", SkipSingle);
+        if (++consecutiveErrs < 3) {
+            QSKIP("Aborted due to errors.", SkipSingle);
+        } else {
+            consecutiveErrs = 0;
+            QSKIP("Too many errors, skipping rest of testfunction.", SkipAll);
+        }
+    } else {
+        consecutiveErrs = 0;
     }
 
+
     if (baseline.status == ImageItem::BaselineNotFound) {
         proto.submitNewBaseline(rendered, 0);
         QSKIP("Baseline not found; new baseline created.", SkipSingle);