osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Exclude scanner-generated headers from ABI check 

They break the check by not including header files for custom types
and they are not part of the API anyway.

Bug: 13018
Change-Id: Ia0f81f861251b5659af723b9da795daeb7454eb3
Reviewed-on: https://code.wireshark.org/review/18297
Reviewed-by: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Balint Reczey <balint@balintreczey.hu>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Balint Reczey 2016-10-18 21:00:56 +02:00 committed by Anders Broman
parent 9c3d81adde
commit f0cb70bd18
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/Makefile.am
View File

@ -558,6 +558,7 @@ endif
# ABI compliance checker can be obtained from
# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
# Checked using version 1.21.12
# TODO: fix wrong headers and select ones providing external API
dumpabi-libwireshark: all abi-descriptor.xml
rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
mkdir abi-check-headers
@ -573,9 +574,11 @@ dumpabi-libwireshark: all abi-descriptor.xml
mkdir abi-check-headers/dissectors
cp dissectors/*.h abi-check-headers/dissectors
rm \
abi-check-headers/*/*_lex.h \
abi-check-headers/dissectors/x11-extension-implementation.h \
abi-check-headers/dissectors/x11-glx-render-enum.h \
abi-check-headers/dissectors/x11-register-info.h \
abi-check-headers/dissectors/packet-lb* \
abi-check-headers/dissectors/packet-idmp.h
mkdir abi-check-headers/ftypes
cp ftypes/*.h abi-check-headers/ftypes

4
wiretap/Makefile.am
View File

@ -243,10 +243,14 @@ ws_version_info.c: $(top_srcdir)/ws_version_info.c
# ABI compliance checker can be obtained from
# http://ispras.linux-foundation.org/index.php/ABI_compliance_checker
# Checked using version 1.21.12
#
# (f)lex generated headers are not part of API and may not include
# all needed headers for used types
dumpabi-libwiretap: all abi-descriptor.xml
rm -rf abi-check-headers abi_dumps .libs/*.abi.tar.gz
mkdir abi-check-headers
cp *.h ../ws_symbol_export.h abi-check-headers/
rm abi-check-headers/*_lex.h abi-check-headers/ascend.h
abi-compliance-checker -log-path abi_logs/log.txt -l libwiretap -v1 `readlink .libs/libwiretap.so | sed 's/.*\.so\.//'` \
-relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
cat abi_logs/log.txt