diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2016-10-18 21:00:56 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-10-20 05:06:57 +0000 |
| commit | f0cb70bd18171a8102f4a6baefb385a1dcd2d960 (patch) | |
| tree | 5518845a81f5cf62a0020e24fd085f4744d01a48 | |
| parent | 9c3d81adde2d901a18fb0dc5a5dc2220f76cd920 (diff) | |
| download | wireshark-f0cb70bd18171a8102f4a6baefb385a1dcd2d960.tar.gz | |
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>
| -rw-r--r-- | epan/Makefile.am | 3 | ||||
| -rw-r--r-- | wiretap/Makefile.am | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/epan/Makefile.am b/epan/Makefile.am index 5c53b84e94..04965bb69e 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -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 diff --git a/wiretap/Makefile.am b/wiretap/Makefile.am index 4cacb0a501..5e20f351e5 100644 --- a/wiretap/Makefile.am +++ b/wiretap/Makefile.am @@ -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 |