[gtk: 6/6] Merge branch 'fix-tools-tests' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 33db28c288c86f75c8387fce8bb29019773bf6d5
Merge: 66a0a8d53e 7db490ef2a
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Mar 13 20:36:54 2020 +0000

    Merge branch 'fix-tools-tests' into 'master'
    
    Fix tools tests
    
    See merge request GNOME/gtk!1524

 testsuite/tools/meson.build                         |  1 +
 testsuite/tools/settings.in                         |  2 +-
 testsuite/tools/simplify-3to4.in                    |  2 +-
 testsuite/tools/simplify-data-3to4/popover.expected |  2 +-
 testsuite/tools/simplify-data/test1.expected        |  5 ++---
 testsuite/tools/simplify-data/test2.expected        |  2 +-
 testsuite/tools/simplify-data/test3.expected        |  2 +-
 testsuite/tools/simplify-data/test4.expected        |  4 ++--
 testsuite/tools/simplify-data/test4.ui              |  2 +-
 testsuite/tools/simplify-data/test5.expected        |  5 ++++-
 testsuite/tools/simplify-data/test5.ui              |  2 +-
 testsuite/tools/simplify-data/test6.expected        |  3 ++-
 testsuite/tools/simplify-data/test6.ui              |  1 +
 testsuite/tools/simplify-data/test7.expected        | 10 +++++++---
 testsuite/tools/simplify-data/test7.ui              | 11 ++++++-----
 testsuite/tools/simplify-data/test8.expected        | 11 -----------
 testsuite/tools/simplify-data/test8.ui              | 12 ------------
 testsuite/tools/simplify-data/test9.expected        | 13 -------------
 testsuite/tools/simplify-data/test9.ui              | 13 -------------
 testsuite/tools/simplify.in                         |  2 +-
 20 files changed, 33 insertions(+), 72 deletions(-)
---