1
=== modified file 'HACKING'
2
--- HACKING	2015-09-15 21:55:44 +0000
3
+++ HACKING	2016-02-15 06:03:52 +0000
4
@@ -293,13 +293,13 @@
5
293
ABI compliance test
293
ABI compliance test
6
294
-------------------
294
-------------------
7
295
295
9
296
The tests include an ABI compliance test (for Wily and later). To run it:
296
The tests include an ABI compliance test (for xenial and later). To run it:
10
297
297
11
298
    $ cd test/abi-compliance
298
    $ cd test/abi-compliance
12
299
    $ make test
299
    $ make test
13
300
300
14
301
The test is also automatically run as part of the test suite.
301
The test is also automatically run as part of the test suite.
16
302
It takes several minutes to run . If you don't want to wait during local builds,
302
It takes a while to run. If you don't want to wait during local builds,
17
303
set the cmake "slowtests" option to OFF to skip the check.
303
set the cmake "slowtests" option to OFF to skip the check.
18
304
304
19
305
The baseline ABI files for the test are in test/abi-compliance/abi_dumps.
305
The baseline ABI files for the test are in test/abi-compliance/abi_dumps.
20
@@ -313,11 +313,8 @@
21
313
Once all the packages are built, you can extract the ABI dump
313
Once all the packages are built, you can extract the ABI dump
22
314
files and add them to the corresponding directory in the source tree.
314
files and add them to the corresponding directory in the source tree.
23
315
315
29
316
The abi-compliance-checker tool produces a report in
316
The abi compliance test produces a report in
30
317
317
libunity-scopes_<current-version>_abi-report.txt if anything unusual is detected.
26
318
    test/abi-compliance/compat_reports/libunity-scopes.so/[version]_to_[version]/compat_report.html
27
319
28
320
The report provides a nicely layed-out page with all the details.
31
321
318
32
322
Autopkg test suite
319
Autopkg test suite
33
323
------------------
320
------------------
34
324
321
35
=== modified file 'debian/VERSION'
36
--- debian/VERSION	2015-09-21 12:30:26 +0000
37
+++ debian/VERSION	2016-02-15 06:03:52 +0000
38
@@ -1,1 +1,1 @@
40
1
1.0.2
1
1.0.3
41
2
2
42
=== modified file 'debian/changelog'
43
--- debian/changelog	2015-12-18 11:42:03 +0000
44
+++ debian/changelog	2016-02-15 06:03:52 +0000
45
@@ -1,3 +1,27 @@
46
1
unity-scopes-api (1.0.3+16.04.20160209-0ubuntu2) UNRELEASED; urgency=medium
47
2
48
3
  [ Michi Henning ]
49
4
  * Changed ABI compliance testing to use abigail.
50
5
51
6
 -- Michi Henning <michi.henning@canonical.com>  Mon, 15 Feb 2016 07:45:13 +1000
52
7
53
8
unity-scopes-api (1.0.3+16.04.20160209-0ubuntu1) xenial; urgency=medium
54
9
55
10
  [ Michi Henning ]
56
11
  * Bumped micro version.
57
12
58
13
  [ CI Train Bot ]
59
14
  * No-change rebuild.
60
15
61
16
 -- Rodney Dawes <ci-train-bot@canonical.com>  Tue, 09 Feb 2016 15:15:15 +0000
62
17
63
18
unity-scopes-api (1.0.3) UNRELEASED; urgency=medium
64
19
65
20
  [ Michi Henning ]
66
21
  * Changed ABI compliance check to use abigail instead of abi-compliance-checker.
67
22
68
23
 -- Michi Henning <michi.henning@canonical.com>  Tue, 09 Feb 2016 17:07:10 +1000
69
24
70
1
unity-scopes-api (1.0.2+16.04.20151218.2-0ubuntu1) xenial; urgency=medium
25
unity-scopes-api (1.0.2+16.04.20151218.2-0ubuntu1) xenial; urgency=medium
71
2
26
72
3
  [ Michi Henning ]
27
  [ Michi Henning ]
73
4
28
74
=== modified file 'debian/control.in'
75
--- debian/control.in	2015-11-13 04:05:00 +0000
76
+++ debian/control.in	2016-02-15 06:03:52 +0000
77
@@ -1,7 +1,8 @@
78
1
Source: unity-scopes-api
1
Source: unity-scopes-api
79
2
Priority: optional
2
Priority: optional
80
3
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
3
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
82
4
Build-Depends: abi-compliance-checker,
4
Build-Depends: abigail-tools | libabigail-tools,
83
5
               binutils,
84
5
               capnproto,
6
               capnproto,
85
6
               click-dev (>= 0.2.2),
7
               click-dev (>= 0.2.2),
86
7
               cmake,
8
               cmake,
87
8
9
88
=== modified file 'test/CMakeLists.txt'
89
--- test/CMakeLists.txt	2015-09-09 07:37:01 +0000
90
+++ test/CMakeLists.txt	2016-02-15 06:03:52 +0000
91
@@ -5,5 +5,5 @@
92
5
5
93
6
if(${slowtests})
6
if(${slowtests})
94
7
    add_subdirectory(headers)
7
    add_subdirectory(headers)
96
8
    add_subdirectory(abi-compliance)  # Keep this test last because it's really slow.
8
    add_subdirectory(abi-compliance)
97
9
endif()
9
endif()
98
10
10
99
=== modified file 'test/abi-compliance/CMakeLists.txt'
100
--- test/abi-compliance/CMakeLists.txt	2015-09-09 07:37:01 +0000
101
+++ test/abi-compliance/CMakeLists.txt	2016-02-15 06:03:52 +0000
102
@@ -1,11 +1,11 @@
103
1
configure_file(abi.xml.in ${CMAKE_CURRENT_BINARY_DIR}/abi.xml)
104
2
configure_file(check-abi-compliance.sh.in ${CMAKE_CURRENT_BINARY_DIR}/check-abi-compliance.sh @ONLY)
1
configure_file(check-abi-compliance.sh.in ${CMAKE_CURRENT_BINARY_DIR}/check-abi-compliance.sh @ONLY)
105
3
configure_file(gen-abi-dump.sh.in ${CMAKE_CURRENT_BINARY_DIR}/gen-abi-dump.sh @ONLY)
2
configure_file(gen-abi-dump.sh.in ${CMAKE_CURRENT_BINARY_DIR}/gen-abi-dump.sh @ONLY)
106
4
3
107
5
set(abi_dump_cmd /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/gen-abi-dump.sh)
4
set(abi_dump_cmd /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/gen-abi-dump.sh)
108
6
set(abi_check_cmd /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/check-abi-compliance.sh)
5
set(abi_check_cmd /bin/sh ${CMAKE_CURRENT_BINARY_DIR}/check-abi-compliance.sh)
111
7
set(abi_dump_file ${CMAKE_CURRENT_BINARY_DIR}/abi_dumps/lib${UNITY_SCOPES_LIB}/lib${UNITY_SCOPES_LIB}_${UNITY_SCOPES_FULL_VERSION}.abi.tar.gz)
6
set(abi_dump_file ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_SCOPES_LIB}_${UNITY_SCOPES_FULL_VERSION}.abi.xml)
112
8
set(abi_report ${CMAKE_CURRENT_BINARY_DIR}/compat_reports/lib${UNITY_SCOPES_LIB}/lib${UNITY_SCOPES_LIB}/${UNITY_SCOPES_MAJOR_MINOR}.0_to_${UNITY_SCOPES_FULL_VERSION}/compat_report.html)
7
set(abi_baseline_dump ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_SCOPES_LIB}_${UNITY_SCOPES_MAJOR}.0.0.abi.xml)
113
8
set(abi_report ${CMAKE_CURRENT_BINARY_DIR}/lib${UNITY_SCOPES_LIB}_${UNITY_SCOPES_FULL_VERSION}_abi-report.txt)
114
9
9
115
10
add_custom_command(
10
add_custom_command(
116
11
    OUTPUT ${abi_dump_file}
11
    OUTPUT ${abi_dump_file}
117
@@ -15,10 +15,14 @@
118
15
add_custom_target(gen-abi-dump DEPENDS ${abi_dump_file})
15
add_custom_target(gen-abi-dump DEPENDS ${abi_dump_file})
119
16
16
120
17
add_custom_command(
17
add_custom_command(
122
18
    OUTPUT ${abi_report}
18
    OUTPUT run_always ${abi_report}
123
19
    COMMAND ${abi_check_cmd}
19
    COMMAND ${abi_check_cmd}
125
20
    DEPENDS gen-abi-dump)
20
    DEPENDS ${abi_dump_file} ${suppressions})
126
21
set_source_files_properties(run_always
127
22
    PROPERTIES SYMBOLIC true)
128
23
set_directory_properties(PROPERTIES
129
24
    ADDITIONAL_MAKE_CLEAN_FILES ${abi_baseline_dump})
130
21
25
132
22
add_custom_target(check-abi DEPENDS ${abi_report})
26
add_custom_target(check-abi DEPENDS run_always)
133
23
27
134
24
add_test(check-abi-compliance ${CMAKE_MAKE_PROGRAM} check-abi)
28
add_test(check-abi-compliance ${CMAKE_MAKE_PROGRAM} check-abi)
135
25
29
136
=== removed file 'test/abi-compliance/abi.xml.in'
137
--- test/abi-compliance/abi.xml.in	2015-08-27 06:41:36 +0000
138
+++ test/abi-compliance/abi.xml.in	1970-01-01 00:00:00 +0000
139
@@ -1,57 +0,0 @@
140
1
<version>
141
2
@UNITY_SCOPES_MAJOR@.@UNITY_SCOPES_MINOR@.@UNITY_SCOPES_MICRO@
142
3
</version>
143
4
144
5
<headers>
145
6
@CMAKE_SOURCE_DIR@/include
146
7
@CMAKE_BINARY_DIR@/src
147
8
@CMAKE_BINARY_DIR@/include/unity
148
9
</headers>
149
10
150
11
<!--
151
12
We skip the internal include directories because we have separate tests
152
13
that already ensure that no public header includes an internal one.
153
14
-->
154
15
<skip_include_paths>
155
16
@CMAKE_BINARY_DIR@/include/unity/scopes/internal
156
17
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/lttng
157
18
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/smartscopes
158
19
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/zmq_middleware
159
20
@CMAKE_BINARY_DIR@/include/unity/scopes/qt/internal
160
21
@CMAKE_BINARY_DIR@/include/unity/scopes/utility/internal
161
22
@CMAKE_SOURCE_DIR@/src/scopes/internal
162
23
@CMAKE_SOURCE_DIR@/src/scopes/internal/lttng
163
24
@CMAKE_SOURCE_DIR@/src/scopes/internal/smartscopes
164
25
@CMAKE_SOURCE_DIR@/src/scopes/qt/internal
165
26
@CMAKE_SOURCE_DIR@/src/scopes/utility/internal
166
27
</skip_include_paths>
167
28
168
29
<libs>
169
30
@CMAKE_BINARY_DIR@/libunity-scopes.so
170
31
</libs>
171
32
172
33
<gcc_options>
173
34
-std=c++11 -fPIC -D_ENABLE_QT_EXPERIMENTAL_ -DQT_NO_KEYWORDS
174
35
</gcc_options>
175
36
176
37
<skip_namespaces>
177
38
unity::scopes::internal
178
39
unity::scopes::qt::internal
179
40
unity::scopes::utility::internal
180
41
</skip_namespaces>
181
42
182
43
<skip_headers>
183
44
@CMAKE_BINARY_DIR@/include/unity/Makefile
184
45
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/lttng/Makefile
185
46
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/Makefile
186
47
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/smartscopes/Makefile
187
48
@CMAKE_BINARY_DIR@/include/unity/scopes/internal/zmq_middleware/Makefile
188
49
@CMAKE_BINARY_DIR@/include/unity/scopes/Makefile
189
50
@CMAKE_BINARY_DIR@/include/unity/scopes/qt/internal/Makefile
190
51
@CMAKE_BINARY_DIR@/include/unity/scopes/qt/Makefile
191
52
@CMAKE_BINARY_DIR@/include/unity/scopes/testing/Makefile
192
53
@CMAKE_BINARY_DIR@/include/unity/scopes/utility/internal/Makefile
193
54
@CMAKE_BINARY_DIR@/include/unity/scopes/utility/Makefile
194
55
@CMAKE_SOURCE_DIR@/include/unity/scopes/internal/lttng/SimpleTracepoint.h
195
56
@CMAKE_SOURCE_DIR@/include/unity/scopes/internal/lttng/UnityScopes_tp.h
196
57
</skip_headers>
197
58
0
198
=== removed file 'test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz'
199
59
Binary files test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
1
Binary files test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
200
=== added file 'test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz'
201
60
Binary files test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
2
Binary files test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/aarch64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
202
=== removed file 'test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.tar.gz'
203
61
Binary files test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
3
Binary files test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
204
=== added file 'test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.xml.gz'
205
62
Binary files test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
4
Binary files test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/arm-linux-gnueabihf/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
206
=== removed file 'test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz'
207
63
Binary files test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
5
Binary files test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
208
=== added file 'test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz'
209
64
Binary files test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
6
Binary files test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/i386-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
210
=== removed file 'test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz'
211
65
Binary files test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
7
Binary files test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
212
=== added file 'test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz'
213
66
Binary files test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
8
Binary files test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/powerpc-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
214
=== removed file 'test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz'
215
67
Binary files test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
9
Binary files test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
216
=== added file 'test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz'
217
68
Binary files test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
10
Binary files test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/powerpc64le-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
218
=== removed file 'test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz'
219
69
Binary files test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
11
Binary files test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	2015-09-08 02:29:27 +0000 and test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.tar.gz	1970-01-01 00:00:00 +0000 differ
220
=== added file 'test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz'
221
70
Binary files test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
12
Binary files test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	1970-01-01 00:00:00 +0000 and test/abi-compliance/abi_dumps/x86_64-linux-gnu/libunity-scopes_1.0.0.abi.xml.gz	2016-02-15 06:03:52 +0000 differ
222
=== modified file 'test/abi-compliance/check-abi-compliance.sh.in'
223
--- test/abi-compliance/check-abi-compliance.sh.in	2015-09-15 21:59:25 +0000
224
+++ test/abi-compliance/check-abi-compliance.sh.in	2016-02-15 06:03:52 +0000
225
@@ -20,10 +20,11 @@
226
20
20
227
21
# Script to check whether the ABI is still intact.
21
# Script to check whether the ABI is still intact.
228
22
#
22
#
231
23
# The base ABI (for version <x>.<y>.0) is kept in libunity-scopes_<x>.<y>.0.abi.tar.gz.
23
# The base ABI (for version <x>.<y>.0) is kept in libunity-scopes_<x>.<y>.0.abi.xml.gz.
232
24
# If the micro version is non-zero, we run abi-compliance-checker to compare the two versions.
24
# If the micro version is non-zero, we run abidiff to compare the two versions.
233
25
# If there are any complaints, we print an error message ane return non-zero status.
25
# If there are any complaints, we print an error message ane return non-zero status.
234
26
26
235
27
set -x
236
27
progname=$(basename $0)
28
progname=$(basename $0)
237
28
29
238
29
distro=$(lsb_release -c -s)
30
distro=$(lsb_release -c -s)
239
@@ -32,26 +33,63 @@
240
32
    exit 0
33
    exit 0
241
33
}
34
}
242
34
35
243
36
[ @UNITY_SCOPES_MICRO@ -eq 0 ] && exit 0
244
37
245
35
libname=lib@UNITY_SCOPES_LIB@
38
libname=lib@UNITY_SCOPES_LIB@
249
36
39
base_abi_dir=@CMAKE_CURRENT_SOURCE_DIR@/abi_dumps/@CMAKE_LIBRARY_ARCHITECTURE@
250
37
base_abi=@CMAKE_CURRENT_SOURCE_DIR@/abi_dumps/@CMAKE_LIBRARY_ARCHITECTURE@/${libname}_@UNITY_SCOPES_MAJOR_MINOR@.0.abi.tar.gz
40
base_abi=${libname}_@UNITY_SCOPES_MAJOR_MINOR@.0.abi.xml
251
38
cur_abi=@CMAKE_CURRENT_BINARY_DIR@/abi_dumps/${libname}/${libname}_@UNITY_SCOPES_FULL_VERSION@.abi.tar.gz
41
252
42
gunzip -c ${base_abi_dir}/${base_abi}.gz >${base_abi}
253
43
254
44
cur_abi=${libname}_@UNITY_SCOPES_FULL_VERSION@.abi.xml
255
45
report=${libname}_@UNITY_SCOPES_FULL_VERSION@_abi-report.txt
256
46
257
47
# If the current lib doesn't contain debug info, we can't run the test.
258
48
# TODO: See https://sourceware.org/bugzilla/show_bug.cgi?id=19621
259
49
info_file=$(mktemp)
260
50
readelf --debug-dump=info @CMAKE_BINARY_DIR@/${libname}.so >$info_file
261
51
[ $? -ne 0 ] && exit 1
262
52
[ -s $info_file ]
263
53
no_debug_info=$?
264
54
rm -f $info_file
265
55
[ $no_debug_info -eq 1 ] && {
266
56
    echo "${progname}: Skipping ABI test because ${libname}.so was compiled without -g"
267
57
    exit 0
268
58
}
269
39
59
270
40
# Compare against the base ABI.
60
# Compare against the base ABI.
273
41
abi-compliance-checker -lib ${libname} -old $base_abi -new $cur_abi
61
abidiff --no-unreferenced-symbols --suppressions @CMAKE_CURRENT_SOURCE_DIR@/suppressions \
274
42
62
    ${base_abi} ${cur_abi} >${report} 2>&1
275
43
status=$?
63
status=$?
290
44
report=@CMAKE_CURRENT_BINARY_DIR@/compat_reports/${libname}/1.0.0_to_@UNITY_SCOPES_FULL_VERSION@/compat_report.html
64
291
45
[ -e $report ] && {
65
# TODO: Exit status test is not reliable with 1.0.rc2 (https://sourceware.org/bugzilla/show_bug.cgi?id=19596).
292
46
    echo "${progname}: Compatibility report generated to $report"
66
#       We instead rely on the report size for the time being. When suppressions are used, and there are
293
47
}
67
#       no problems, the report still contains three lines of summary, so we fail if there are more than
294
48
68
#       three lines.
295
49
[ $status -ne 0 ] && {
69
num_lines=$(wc -l <${report})
296
50
    [ $status -eq 1 ] && {
70
[ $num_lines -gt 3 ] && {
297
51
        echo "${progname}: ERROR: Incompatible ABI!" >&2
71
    echo "${progname}: ERROR: Incompatible ABI!" >&2
298
52
    }
72
    cat ${report} >&2
299
53
    echo "${progname}: ERROR: abi-compliance-checker returned exit status $status" >&2
73
    exit 8
300
54
    exit 1
74
}
301
55
}
75
exit $status  # TODO
302
56
76
303
57
exit 0
77
# Incompatible changes found.
304
78
[ $status -ge 8 ] && {
305
79
    echo "${progname}: ERROR: Incompatible ABI!" >&2
306
80
    cat ${report} >&2
307
81
    exit $status
308
82
}
309
83
310
84
# Possibly incompatible changes found.
311
85
[ $status -ge 4 ] && {
312
86
    echo "${progname}: ABI has possibly incompatible changes, see $report for details."
313
87
    exit $status
314
88
}
315
89
316
90
# All went fine.
317
91
[ $status -eq 0 ] && exit 0
318
92
319
93
# Some other error
320
94
echo "${progname}: Unexpected error, see $report for details." >&2
321
95
exit $status
322
58
96
323
=== modified file 'test/abi-compliance/gen-abi-dump.sh.in'
324
--- test/abi-compliance/gen-abi-dump.sh.in	2015-09-10 00:39:52 +0000
325
+++ test/abi-compliance/gen-abi-dump.sh.in	2016-02-15 06:03:52 +0000
326
@@ -21,7 +21,7 @@
327
21
# Script to dump the current ABI.
21
# Script to dump the current ABI.
328
22
22
329
23
libname=lib@UNITY_SCOPES_LIB@
23
libname=lib@UNITY_SCOPES_LIB@
331
24
cur_abi=@CMAKE_CURRENT_BINARY_DIR@/abi_dumps/${libname}/${libname}_@UNITY_SCOPES_FULL_VERSION@.abi.tar.gz
24
cur_abi=@CMAKE_CURRENT_BINARY_DIR@/${libname}_@UNITY_SCOPES_FULL_VERSION@.abi.xml
332
25
25
333
26
distro=$(lsb_release -c -s)
26
distro=$(lsb_release -c -s)
334
27
[ "$distro" = "vivid" ] && {
27
[ "$distro" = "vivid" ] && {
335
@@ -30,6 +30,6 @@
336
30
}
30
}
337
31
31
338
32
# Dump the current ABI.
32
# Dump the current ABI.
340
33
abi-compliance-checker -lib ${libname} -dump @CMAKE_CURRENT_BINARY_DIR@/abi.xml
33
abidw --out-file ${cur_abi} @CMAKE_BINARY_DIR@/${libname}.so
341
34
34
342
35
exit $?
35
exit $?
343
36
36
344
=== added file 'test/abi-compliance/suppressions'
345
--- test/abi-compliance/suppressions	1970-01-01 00:00:00 +0000
346
+++ test/abi-compliance/suppressions	2016-02-15 06:03:52 +0000
347
@@ -0,0 +1,21 @@
348
1
# Suppressions for template functions that are instantiated due to new
349
2
# types that were added since the baseline.
350
3
351
4
# TODO: The allows_other_aliases is currently needed due to a bug in abigail 1.0.rc2.
352
5
#       One a newer version becomes available, they can be removed.
353
6
#       https://sourceware.org/bugzilla/show_bug.cgi?id=19619
354
7
355
8
[suppress_function]
356
9
    name_regexp = boost::.*
357
10
    change_kind = added-function
358
11
    allow_other_aliases = false
359
12
360
13
[suppress_function]
361
14
    name_regexp = std::.*
362
15
    change_kind = added-function
363
16
    allow_other_aliases = false
364
17
365
18
[suppress_function]
366
19
    name_regexp = unity::scopes::testing::.*
367
20
    change_kind = added-function
368
21
    allow_other_aliases = false
Status:	Merged
Approved by:	James Henstridge on 2016-02-22
Approved revision:	683
Merged at revision:	655
Proposed branch:	lp:~michihenning/unity-scopes-api/abigail
Merge into:	lp:unity-scopes-api/devel
Diff against target:	368 lines (+124/-96) 10 files modified HACKING (+4/-7) debian/VERSION (+1/-1) debian/changelog (+24/-0) debian/control.in (+2/-1) test/CMakeLists.txt (+1/-1) test/abi-compliance/CMakeLists.txt (+10/-6) test/abi-compliance/abi.xml.in (+0/-57) test/abi-compliance/check-abi-compliance.sh.in (+59/-21) test/abi-compliance/gen-abi-dump.sh.in (+2/-2) test/abi-compliance/suppressions (+21/-0)
To merge this branch:	bzr merge lp:~michihenning/unity-scopes-api/abigail
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
James Henstridge		2016-02-10	Approve on 2016-02-22
PS Jenkins bot (community)	continuous-integration		Approve on 2016-02-15
Review via email: mp+285551@code.launchpad.net