isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-21 20:51:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Make testboxes an actual test

Browse Source 
testboxes was a binary that did unit testing, but it wasn't integrated
to the test system, so in effect, it was never run. Instead integrate it
into the other mutter unit tests. This includes changing a few of
meta_warning()s into g_warning()s so that the GTest framework can handle
them.
This commit is contained in:
Jonas Ådahl
2018-07-09 18:42:19 +02:00
parent 8a03f1ad02
commit 92f4ffc0dd
5 changed files with 76 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/core/boxes.c
View File

@ -437,8 +437,8 @@ merge_spanning_rects_in_region (GList *region)
if (region == NULL)
{
meta_warning ("Region to merge was empty! Either you have a some "
"pathological STRUT list or there's a bug somewhere!\n");
g_warning ("Region to merge was empty! Either you have a some "
"pathological STRUT list or there's a bug somewhere!\n");
return NULL;
}
@ -961,7 +961,7 @@ meta_rectangle_clamp_to_fit_into_region (const GList *spanning_rects,
/* Clamp rect appropriately */
if (best_rect == NULL)
{
meta_warning ("No rect whose size to clamp to found!\n");
g_warning ("No rect whose size to clamp to found!\n");
/* If it doesn't fit, at least make it no bigger than it has to be */
if (!(fixed_directions & FIXED_DIRECTION_X))
@ -1024,7 +1024,9 @@ meta_rectangle_clip_to_region (const GList *spanning_rects,
/* Clip rect appropriately */
if (best_rect == NULL)
meta_warning ("No rect to clip to found!\n");
{
g_warning ("No rect to clip to found!\n");
}
else
{
/* Extra precaution with checking fixed direction shouldn't be needed
@ -1120,7 +1122,9 @@ meta_rectangle_shove_into_region (const GList *spanning_rects,
/* Shove rect appropriately */
if (best_rect == NULL)
meta_warning ("No rect to shove into found!\n");
{
g_warning ("No rect to shove into found!\n");
}
else
{
/* Extra precaution with checking fixed direction shouldn't be needed

1410
src/core/testboxes.c
View File

File diff suppressed because it is too large Load Diff