diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-26 12:01:58 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-26 12:01:58 +0000 |
| commit | 24f0ae1d3981f8d7b5ab6a3980f7999ef0600c65 (patch) | |
| tree | 712bd4fa19d0a8d3396c874725f2aed8b8b9d818 | |
| parent | c0ca3c642a49d1c87ca6fb7404afef98984eb0a5 (diff) | |
| parent | b2b044ce95a17f2ec81b9c83fbe0e818873b03d7 (diff) | |
| download | gtk+-24f0ae1d3981f8d7b5ab6a3980f7999ef0600c65.tar.gz | |
Merge branch 'move-text-history-tests' into 'master'
Move text history tests
See merge request GNOME/gtk!3597
| -rw-r--r-- | tests/meson.build | 1 | ||||
| -rw-r--r-- | testsuite/gtk/meson.build | 1 | ||||
| -rw-r--r-- | testsuite/gtk/texthistory.c (renamed from tests/testtexthistory.c) | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/tests/meson.build b/tests/meson.build index 8ea23bf3fd..b548db4e7a 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -114,7 +114,6 @@ gtk_tests = [ ['testtexture'], ['testwindowdrag'], ['testinhibitshortcuts'], - ['testtexthistory', ['../gtk/gtktexthistory.c']], ['testzoom'] ] diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build index a33fd29c1e..9fe45d339b 100644 --- a/testsuite/gtk/meson.build +++ b/testsuite/gtk/meson.build @@ -117,6 +117,7 @@ internal_tests = [ { 'name': 'propertylookuplistmodel' }, { 'name': 'rbtree' }, { 'name': 'timsort' }, + { 'name': 'texthistory' }, ] # Tests that are expected to fail diff --git a/tests/testtexthistory.c b/testsuite/gtk/texthistory.c index 556b2ac45f..f9fe45ceb2 100644 --- a/tests/testtexthistory.c +++ b/testsuite/gtk/texthistory.c @@ -582,7 +582,8 @@ int main (int argc, char *argv[]) { - g_test_init (&argc, &argv, NULL); + (g_test_init) (&argc, &argv, NULL); + g_test_add_func ("/Gtk/TextHistory/test1", test1); g_test_add_func ("/Gtk/TextHistory/test2", test2); g_test_add_func ("/Gtk/TextHistory/test3", test3); @@ -596,5 +597,6 @@ main (int argc, g_test_add_func ("/Gtk/TextHistory/test11", test11); g_test_add_func ("/Gtk/TextHistory/test12", test12); g_test_add_func ("/Gtk/TextHistory/test13", test13); + return g_test_run (); } |