[QA] Prevent warning from test_coord_conversion.c and ignore test outputs

diff --git a/.gitignore b/.gitignore
index 0370642e6ee5ed268ddc675c00869ea95fdf2cf0..47f5b5db958cbcb91a7cb5e923cd27d0ab707ff3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -112,6 +112,8 @@ src/misc/*.o
 /test/Makefile.in
 /test/Makefile
 /test/*.o
+/test/check_degrees_conversions.sh.*
+/test/test-suite.log
 /test/gpx2gpx
 /test/degrees_converter
 /test/test_vikgotoxmltool

diff --git a/test/test_coord_conversion.c b/test/test_coord_conversion.c
index e49fd6f20a701bb1854a094a7e370fbb14f6f848..85781e4762106bc95dd3a30d49165f69a1868ce8 100644 (file)
--- a/test/test_coord_conversion.c
+++ b/test/test_coord_conversion.c
@@ -28,8 +28,10 @@ void test_mapcoord_to_center_coord (VikMapSource *source, int x, int y, int scal
 
 int main(int argc, char *argv[])
 {
+#if ! GLIB_CHECK_VERSION (2, 36, 0)
   g_type_init();
-  
+#endif
+
   VikMapSource *spotmaps4osm_wmsc_type = 
     VIK_MAP_SOURCE(g_object_new(VIK_TYPE_WMSC_MAP_SOURCE,
                                 "id", 202,