Use a test-oriented init call

This commit is contained in:
David Boddie
2019-07-30 17:20:15 +02:00
parent e801a68f0d
commit 9b2fcf89e8
4 changed files with 3 additions and 186 deletions

View File

@ -39,7 +39,7 @@ test_create (void)
int
main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
gtk_test_init (&argc, &argv, NULL);
g_test_add_func ("/eek-simple-test/create", test_create);
return g_test_run ();
}

View File

@ -46,8 +46,7 @@ test_output_parse (void)
int
main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
gtk_init (&argc, &argv); /* for gdk_x11_display_get_xdisplay() */
gtk_test_init (&argc, &argv, NULL);
g_test_add_func ("/eek-xml-test/output-parse", test_output_parse);

View File

@ -1,181 +0,0 @@
<?xml version="1.0"?>
<keyboard version="0.90">
<bounds>0.000000,0.000000,124.000000,149.000000</bounds>
<section name="Keypad">
<bounds>10.000000,10.000000,104.000000,129.000000</bounds>
<angle>0</angle>
<row>
<columns>4</columns>
<orientation>1</orientation>
</row>
<row>
<columns>4</columns>
<orientation>1</orientation>
</row>
<row>
<columns>3</columns>
<orientation>1</orientation>
</row>
<row>
<columns>4</columns>
<orientation>1</orientation>
</row>
<row>
<columns>2</columns>
<orientation>1</orientation>
</row>
<key id="keycode91" name="KPDL" column="1" row="4">
<bounds>54.000000,104.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65439">KP_Delete</keysym>
<keysym keyval="65454">KP_Decimal</keysym>
</symbols>
</key>
<key id="keycode90" name="KP0" column="0" row="4">
<bounds>2.000000,104.000000,50.000000,24.000000</bounds>
<outline-ref>outline1</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65438">KP_Insert</keysym>
<keysym keyval="65456">KP_0</keysym>
</symbols>
</key>
<key id="keycode108" name="KPEN" column="3" row="3">
<bounds>80.000000,78.000000,24.000000,50.000000</bounds>
<outline-ref>outline2</outline-ref>
<symbols groups="1" levels="1">
<keysym keyval="65421">KP_Enter</keysym>
</symbols>
</key>
<key id="keycode89" name="KP3" column="2" row="3">
<bounds>54.000000,78.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65435">KP_Next</keysym>
<keysym keyval="65459">KP_3</keysym>
</symbols>
</key>
<key id="keycode88" name="KP2" column="1" row="3">
<bounds>28.000000,78.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65433">KP_Down</keysym>
<keysym keyval="65458">KP_2</keysym>
</symbols>
</key>
<key id="keycode87" name="KP1" column="0" row="3">
<bounds>2.000000,78.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65436">KP_End</keysym>
<keysym keyval="65457">KP_1</keysym>
</symbols>
</key>
<key id="keycode85" name="KP6" column="2" row="2">
<bounds>54.000000,53.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65432">KP_Right</keysym>
<keysym keyval="65462">KP_6</keysym>
</symbols>
</key>
<key id="keycode84" name="KP5" column="1" row="2">
<bounds>28.000000,53.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65437">KP_Begin</keysym>
<keysym keyval="65461">KP_5</keysym>
</symbols>
</key>
<key id="keycode83" name="KP4" column="0" row="2">
<bounds>2.000000,53.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65430">KP_Left</keysym>
<keysym keyval="65460">KP_4</keysym>
</symbols>
</key>
<key id="keycode86" name="KPAD" column="3" row="1">
<bounds>80.000000,27.000000,24.000000,50.000000</bounds>
<outline-ref>outline2</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65451">KP_Add</keysym>
<keysym keyval="269024802"></keysym>
</symbols>
</key>
<key id="keycode81" name="KP9" column="2" row="1">
<bounds>54.000000,27.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65434">KP_Prior</keysym>
<keysym keyval="65465">KP_9</keysym>
</symbols>
</key>
<key id="keycode80" name="KP8" column="1" row="1">
<bounds>28.000000,27.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65431">KP_Up</keysym>
<keysym keyval="65464">KP_8</keysym>
</symbols>
</key>
<key id="keycode79" name="KP7" column="0" row="1">
<bounds>2.000000,27.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65429">KP_Home</keysym>
<keysym keyval="65463">KP_7</keysym>
</symbols>
</key>
<key id="keycode82" name="KPSU" column="3" row="0">
<bounds>80.000000,1.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65453">KP_Subtract</keysym>
<keysym keyval="269024803"></keysym>
</symbols>
</key>
<key id="keycode63" name="KPMU" column="2" row="0">
<bounds>54.000000,1.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65450">KP_Multiply</keysym>
<keysym keyval="269024801"></keysym>
</symbols>
</key>
<key id="keycode112" name="KPDV" column="1" row="0">
<bounds>28.000000,1.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65455">KP_Divide</keysym>
<keysym keyval="269024800"></keysym>
</symbols>
</key>
<key id="keycode77" name="NMLK" column="0" row="0">
<bounds>2.000000,1.000000,24.000000,24.000000</bounds>
<outline-ref>outline0</outline-ref>
<symbols groups="1" levels="2">
<keysym keyval="65407">Num_Lock</keysym>
<keysym keyval="65273">Pointer_EnableKeys</keysym>
</symbols>
</key>
</section>
<outline id="outline0">
<point>0.000000,0.000000</point>
<point>24.000000,0.000000</point>
<point>24.000000,24.000000</point>
<point>0.000000,24.000000</point>
</outline>
<outline id="outline1">
<point>0.000000,0.000000</point>
<point>50.000000,0.000000</point>
<point>50.000000,24.000000</point>
<point>0.000000,24.000000</point>
</outline>
<outline id="outline2">
<point>0.000000,0.000000</point>
<point>24.000000,0.000000</point>
<point>24.000000,50.000000</point>
<point>0.000000,50.000000</point>
</outline>
</keyboard>

View File

@ -63,8 +63,7 @@ test_check_xkb (void)
int
main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
gtk_init (&argc, &argv); /* for gdk_x11_display_get_xdisplay() */
gtk_test_init (&argc, &argv, NULL);
g_test_add_func ("/test-keymap-generation/check-xkb", test_check_xkb);