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

dumpabi: Fix log paths. 

Make sure the paths we pass to "cat" and "abi-compliance-checker
-log-path" match.

Change-Id: Ie68b445b9d92d85c0ed1eb508a78c0bcc960d061
Reviewed-on: https://code.wireshark.org/review/18156
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2016-10-11 14:01:20 -07:00
parent f92daa140b
commit 13139a9853
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/Makefile.am
View File

@ -582,7 +582,7 @@ dumpabi-libwireshark: all abi-descriptor.xml
cp wmem/*.h abi-check-headers/wmem
abi-compliance-checker -log-path abi_logs/log.txt -l libwireshark -v1 `readlink .libs/libwireshark.so | sed 's/.*\.so\.//'` \
-relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
cat abi_logs/log.txt logs/libwireshark/[0-9]*/log.txt
cat abi_logs/log.txt
cp -f abi_dumps/libwireshark/libwireshark_* .libs/
cd .libs && ln -sf libwireshark_*.abi.tar.gz libwireshark.abi.tar.gz

2
wiretap/Makefile.am
View File

@ -249,7 +249,7 @@ dumpabi-libwiretap: all abi-descriptor.xml
cp *.h ../ws_symbol_export.h abi-check-headers/
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 logs/libwiretap/[0-9]*/log.txt
cat abi_logs/log.txt
cp -f abi_dumps/libwiretap/libwiretap_* .libs/
cd .libs && ln -sf libwiretap_*.abi.tar.gz libwiretap.abi.tar.gz

2
wsutil/Makefile.am
View File

@ -227,7 +227,7 @@ dumpabi-libwsutil: all abi-descriptor.xml
cp ../config.h ../ws_symbol_export.h $(libwsutil_abi_INCLUDES) abi-check-headers/
abi-compliance-checker -log-path abi_logs/log.txt -l libwsutil -v1 `readlink .libs/libwsutil.so | sed 's/.*\.so\.//'` \
-relpath $(abs_srcdir) -dump-abi abi-descriptor.xml || \
cat logs/libwsutil/[0-9]*/log.txt
cat abi_logs/log.txt
cp -f abi_dumps/libwsutil/libwsutil_* .libs/
cd .libs && ln -sf libwsutil_*.abi.tar.gz libwsutil.abi.tar.gz