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

[Matthias Clasen <matthiasc src gnome org>]

commit 15b8ee4564e0cd99123da87f3a8065903605a5b8
Merge: 84d3848c01 d61e77dab4
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun May 5 20:19:13 2019 +0000

    Merge branch 'simplify-tests' into 'master'
    
    Simplify tests
    
    See merge request GNOME/gtk!820

 gtk/tools/gtk-builder-tool-simplify.c              | 215 +++++++++++++++------
 testsuite/tools/meson.build                        |   3 +-
 testsuite/tools/simplify-3to4.in                   |  31 +++
 .../tools/simplify-data-3to4/assistant.expected    |  28 +++
 testsuite/tools/simplify-data-3to4/assistant.ui    |  28 +++
 testsuite/tools/simplify-data-3to4/grid.expected   | 110 +++++++++++
 testsuite/tools/simplify-data-3to4/grid.ui         | 138 +++++++++++++
 .../tools/simplify-data-3to4/notebook.expected     |  38 ++++
 testsuite/tools/simplify-data-3to4/notebook.ui     |  37 ++++
 testsuite/tools/simplify-data-3to4/stack.expected  |  43 +++++
 testsuite/tools/simplify-data-3to4/stack.ui        |  46 +++++
 testsuite/tools/simplify-data-3to4/test1.expected  |  10 +
 testsuite/tools/simplify.in                        |   2 +-
 13 files changed, 664 insertions(+), 65 deletions(-)
---