AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-30 15:31:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix-tools-tests' into 'master'

Browse Source 
Fix tools tests

See merge request GNOME/gtk!1524
This commit is contained in:
Matthias Clasen 2020-03-13 20:36:54 +00:00
commit 33db28c288
20 changed files with 33 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testsuite/tools/meson.build
View File

@ -19,6 +19,7 @@ if bash.found()
test(t, bash,
args: t,
workdir: meson.current_build_dir(),
protocol: 'tap',
env: [ 'GIO_USE_VOLUME_MONITOR=unix',
'GSETTINGS_BACKEND=memory',
'GDK_DEBUG=default-settings',

2
testsuite/tools/settings.in
View File

@ -10,7 +10,7 @@ echo "1..1"
name=gtk-query-settings
result=$TEST_RESULT_DIR/$name.out
$GTK_QUERY_SETTINGS 2>/dev/null >$result
if [ $(wc -l $result | cut -f1 -d' ') -eq 882 ]; then
if [ $(wc -l $result | cut -f1 -d' ') -eq 48 ]; then
echo "ok 1 $name"
else
echo "not ok 1 $name"

2
testsuite/tools/simplify-3to4.in
View File

@ -1,7 +1,7 @@
#! /bin/bash
GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool}
TEST_DATA_DIR=${TEST_DATA_DIR:-./simplify-data-3to4}
TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/simplify-data-3to4
TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}
shopt -s nullglob

2
testsuite/tools/simplify-data-3to4/popover.expected
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkPopover" id="popover">
<property name="modal">0</property>
<property name="autohide">0</property>
</object>
</interface>

5
testsuite/tools/simplify-data/test1.expected
View File

@ -1,5 +1,4 @@
<!-- default property gets stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
</object>
<object class="GtkWindow"/>
</interface>

2
testsuite/tools/simplify-data/test2.expected
View File

@ -1,4 +1,4 @@
<!-- non-default property not stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
<property name="visible">1</property>

2
testsuite/tools/simplify-data/test3.expected
View File

@ -1,4 +1,4 @@
<!-- translatable property not stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
<property name="visible" translatable="yes">0</property>

4
testsuite/tools/simplify-data/test4.expected
View File

@ -1,6 +1,6 @@
<!-- irrelevant comments and context are stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
<property name="visible">1</property>
<property name="visible" comments="foo" context="bla">1</property>
</object>
</interface>

2
testsuite/tools/simplify-data/test4.ui
View File

@ -1,4 +1,4 @@
<!-- irrelevant comments and context are stripped -->
<!-- comments and context are preserved -->
<interface>
<object class="GtkWindow">
<property name="visible" comments="foo" context="bla">True</property>

5
testsuite/tools/simplify-data/test5.expected
View File

@ -1,8 +1,11 @@
<!-- placeholders are stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
<child>
<object class="GtkBox">
<child>
<placeholder/>
</child>
</object>
</child>
</object>

2
testsuite/tools/simplify-data/test5.ui
View File

@ -1,4 +1,4 @@
<!-- placeholders are stripped -->
<!-- placeholders are preserved -->
<interface>
<object class="GtkWindow">
<child>

3
testsuite/tools/simplify-data/test6.expected
View File

@ -1,5 +1,6 @@
<!-- non-canonical property name works -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkWindow">
<property name="default_height">200</property>
</object>
</interface>

1
testsuite/tools/simplify-data/test6.ui
View File

@ -2,5 +2,6 @@
<interface>
<object class="GtkWindow">
<property name="default_width">-1</property>
<property name="default_height">200</property>
</object>
</interface>

10
testsuite/tools/simplify-data/test7.expected
View File

@ -1,8 +1,12 @@
<!-- default child property gets stripped -->
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkBox">
<object class="GtkGrid">
<child>
<object class="GtkLabel"/>
<object class="GtkLabel">
<layout>
<property name="row-span">2</property>
</layout>
</object>
</child>
</object>
</interface>

11
testsuite/tools/simplify-data/test7.ui
View File

@ -1,12 +1,13 @@
<!-- default child property gets stripped -->
<!-- default layout property gets stripped -->
<interface>
<object class="GtkBox">
<object class="GtkGrid">
<child>
<object class="GtkLabel">
<layout>
<property name="column-span">1</property>
<property name="row-span">2</property>
</layout>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
</object>
</interface>

11
testsuite/tools/simplify-data/test8.expected
View File

@ -1,11 +0,0 @@
<!-- non-default child property remains -->
<interface>
<object class="GtkBox">
<child>
<object class="GtkLabel"/>
<packing>
<property name="expand">1</property>
</packing>
</child>
</object>
</interface>

12
testsuite/tools/simplify-data/test8.ui
View File

@ -1,12 +0,0 @@
<!-- non-default child property remains -->
<interface>
<object class="GtkBox">
<child>
<object class="GtkLabel">
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
</object>
</interface>

13
testsuite/tools/simplify-data/test9.expected
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<object class="GtkGrid">
<child>
<object class="GtkLabel">
<layout>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</layout>
</object>
</child>
</object>
</interface>

13
testsuite/tools/simplify-data/test9.ui
View File

@ -1,13 +0,0 @@
<!-- non-default child property remains -->
<interface>
<object class="GtkGrid">
<child>
<object class="GtkLabel">
<layout>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</layout>
</object>
</child>
</object>
</interface>

2
testsuite/tools/simplify.in
View File

@ -1,7 +1,7 @@
#! /bin/bash
GTK_BUILDER_TOOL=${GTK_BUILDER_TOOL:-gtk4-builder-tool}
TEST_DATA_DIR=${TEST_DATA_DIR:-./simplify-data}
TEST_DATA_DIR=${G_TEST_SRCDIR:-.}/simplify-data
TEST_RESULT_DIR=${TEST_RESULT_DIR:-/tmp}
shopt -s nullglob