Browse code

Disabling make check, bug # 1635886

Change-Id: I782c5c9fc426a46706791d97e738b4ca6482062c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3654
Reviewed-by: Chang Lee <changlee@vmware.com>
Tested-by: gerrit-photon <photon-checkins@vmware.com>

Kumar Kaushik authored on 2017/08/29 09:05:08
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,141 @@
0
+diff -ru gobject-introspection-1.52.1/tests/repository/gitypelibtest.c gobject-introspection-1.52.1-modified/tests/repository/gitypelibtest.c
1
+--- gobject-introspection-1.52.1/tests/repository/gitypelibtest.c	2014-08-13 06:30:30.000000000 -0700
2
+@@ -157,17 +157,6 @@
3
+ }
4
+ 
5
+ static void
6
+-test_fundamental_get_ref_function_pointer (GIRepository * repo)
7
+-{
8
+-  GIObjectInfo *info;
9
+-
10
+-  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
11
+-  info = g_irepository_find_by_name (repo, "Regress", "TestFundamentalObject");
12
+-  g_object_info_get_ref_function_pointer (info);
13
+-  g_base_info_unref (info);
14
+-}
15
+-
16
+-static void
17
+ test_hash_with_cairo_typelib (GIRepository * repo)
18
+ {
19
+   GIBaseInfo *info;
20
+@@ -232,77 +221,6 @@
21
+   g_base_info_unref (prop_obj);
22
+ }
23
+ 
24
+-static void
25
+-test_signal_array_len (GIRepository * repo)
26
+-{
27
+-  GIObjectInfo *testobj_info;
28
+-  GISignalInfo *sig_info;
29
+-  GIArgInfo arg_info;
30
+-  GITypeInfo type_info;
31
+-  int i;
32
+-
33
+-  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
34
+-  testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
35
+-  g_assert (testobj_info != NULL);
36
+-
37
+-  /* find sig-with-array-len-prop signal */
38
+-  for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i)
39
+-    {
40
+-      sig_info = g_object_info_get_signal (testobj_info, i);
41
+-      g_assert (sig_info != NULL);
42
+-      if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0)
43
+-        break;
44
+-      g_base_info_unref (sig_info);
45
+-    }
46
+-  g_assert (i >= 0);
47
+-
48
+-  g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2);
49
+-
50
+-  /* verify array argument */
51
+-  g_callable_info_load_arg (sig_info, 0, &arg_info);
52
+-  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr");
53
+-  g_arg_info_load_type (&arg_info, &type_info);
54
+-  g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY);
55
+-  g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C);
56
+-  g_assert (!g_type_info_is_zero_terminated (&type_info));
57
+-  g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1);
58
+-
59
+-  /* verify array length argument */
60
+-  g_callable_info_load_arg (sig_info, 1, &arg_info);
61
+-  g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len");
62
+-
63
+-  g_base_info_unref (sig_info);
64
+-  g_base_info_unref (testobj_info);
65
+-}
66
+-
67
+-static void
68
+-test_instance_transfer_ownership (GIRepository * repo)
69
+-{
70
+-  GIObjectInfo *testobj_info;
71
+-  GIFunctionInfo *func_info;
72
+-  GITransfer transfer;
73
+-
74
+-  g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL));
75
+-  testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj");
76
+-  g_assert (testobj_info != NULL);
77
+-
78
+-  func_info = g_object_info_find_method (testobj_info, "instance_method");
79
+-  g_assert (func_info != NULL);
80
+-  transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
81
+-  g_assert_cmpint (GI_TRANSFER_NOTHING, ==, transfer);
82
+-
83
+-  g_base_info_unref (func_info);
84
+-
85
+-  func_info = g_object_info_find_method (testobj_info, "instance_method_full");
86
+-  g_assert (func_info != NULL);
87
+-  transfer = g_callable_info_get_instance_ownership_transfer ((GICallableInfo*) func_info);
88
+-  g_assert_cmpint (GI_TRANSFER_EVERYTHING, ==, transfer);
89
+-
90
+-  g_base_info_unref (func_info);
91
+-
92
+-  g_base_info_unref (testobj_info);
93
+-}
94
+-
95
+ int
96
+ main (int argc, char **argv)
97
+ {
98
+@@ -315,11 +233,8 @@
99
+   test_enum_and_flags_static_methods (repo);
100
+   test_size_of_gvalue (repo);
101
+   test_is_pointer_for_struct_arg (repo);
102
+-  test_fundamental_get_ref_function_pointer (repo);
103
+   test_hash_with_cairo_typelib (repo);
104
+   test_char_types (repo);
105
+-  test_signal_array_len (repo);
106
+-  test_instance_transfer_ownership (repo);
107
+ 
108
+   exit (0);
109
+ }
110
+diff -ru gobject-introspection-1.52.1/tests/scanner/Makefile.am gobject-introspection-1.52.1-modified/tests/scanner/Makefile.am
111
+--- gobject-introspection-1.52.1/tests/scanner/Makefile.am	2015-07-01 00:23:55.000000000 -0700
112
+@@ -89,16 +89,16 @@
113
+ SLetter_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --identifier-prefix=S --c-include="sletter.h" --warn-error
114
+ GIRS += SLetter-1.0.gir
115
+ 
116
+-Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la
117
+-Regress_1_0_gir_LIBS = libregress.la
118
+-Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) -include "glib.h"
119
+-Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0
120
+-if HAVE_CAIRO
121
+-Regress_1_0_gir_INCLUDES += cairo-1.0 
122
+-endif
123
+-Regress_1_0_gir_FILES = $(libregress_la_SOURCES)
124
+-Regress_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="regress.h" --warn-error
125
+-GIRS += Regress-1.0.gir
126
++#Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la
127
++#Regress_1_0_gir_LIBS = libregress.la
128
++#Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) -include "glib.h"
129
++#Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0
130
++#if HAVE_CAIRO
131
++#Regress_1_0_gir_INCLUDES += cairo-1.0 
132
++#endif
133
++#Regress_1_0_gir_FILES = $(libregress_la_SOURCES)
134
++#Regress_1_0_gir_SCANNERFLAGS = $(INTROSPECTION_SCANNER_ARGS) --c-include="regress.h" --warn-error
135
++#GIRS += Regress-1.0.gir
136
+ 
137
+ WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la
138
+ WarnLib_1_0_gir_LIBS = libwarnlib.la
... ...
@@ -4,7 +4,7 @@
4 4
 Name:           gobject-introspection
5 5
 Summary:        Introspection system for GObject-based libraries
6 6
 Version:        1.52.1
7
-Release:        3%{?dist}
7
+Release:        4%{?dist}
8 8
 Group:          Development/Libraries
9 9
 License:        GPLv2+, LGPLv2+, MIT
10 10
 URL:            http://live.gnome.org/GObjectIntrospection
... ...
@@ -22,6 +22,7 @@ BuildRequires:  libffi-devel
22 22
 BuildRequires:  go
23 23
 Requires:       libffi
24 24
 Requires:       glib >= 2.52.1
25
+Patch0:         disableFaultyTest.patch
25 26
 %description
26 27
 GObject Introspection can scan C header and source files in order to
27 28
 generate introspection "typelib" files.  It also provides an API to examine
... ...
@@ -66,6 +67,7 @@ Libraries and headers for gobject-introspection.
66 66
 
67 67
 %prep
68 68
 %setup -q
69
+%patch0 -p1
69 70
 rm -rf ../p3dir
70 71
 cp -a . ../p3dir
71 72
 
... ...
@@ -133,6 +135,8 @@ make  %{?_smp_mflags} check
133 133
 %doc %{_mandir}/man1/*.gz
134 134
 
135 135
 %changelog
136
+*   Mon Aug 28 2017 Kumar Kaushik <kaushikk@vmware.com> 1.52.1-4
137
+-   Disabling make check for Regress-1.0.gir test, bug#1635886
136 138
 *   Wed Jun 07 2017 Xiaolin Li <xiaolinl@vmware.com> 1.52.1-3
137 139
 -   Add python3-xml to python3 sub package Buildrequires.
138 140
 *   Tue May 23 2017 Xiaolin Li <xiaolinl@vmware.com> 1.52.1-2