diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:11:14 +0200 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-08-31 11:11:14 +0200 |
| commit | bbb262bfd5200313834db8fb36b7fb20aa0913b5 (patch) | |
| tree | 70fad3f1f44bb7299dd1f5f376a6b8483a023136 /tools | |
| parent | 6e17a2e7ad9453c0afe34dab0e6768ad8ee447c2 (diff) | |
| parent | 9d722f3d3492e31c0b3e4bcba603ffd65309c621 (diff) | |
Merge remote-tracking branch 'salsa/debian/master' into ubuntu/master
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/create-exports-NetworkManager.sh | 7 | ||||
| -rwxr-xr-x | tools/run-nm-test.sh | 8 |
2 files changed, 6 insertions, 9 deletions
diff --git a/tools/create-exports-NetworkManager.sh b/tools/create-exports-NetworkManager.sh index b089aba2..f439bd31 100755 --- a/tools/create-exports-NetworkManager.sh +++ b/tools/create-exports-NetworkManager.sh @@ -40,11 +40,7 @@ call_nm() { } get_symbols_nm () { - if [ -z "$from_meson" ]; then - base=./src/.libs/libNetworkManager.a - else - base=./src/nm-full-symbols - fi + base=./src/NetworkManager-all-sym call_nm "$base" | sed -n 's/^[tTDGRBS] //p' | _sort @@ -104,6 +100,7 @@ if [ -f "build.ninja" ]; then from_meson=1 libs= else + from_meson= libs=.libs/ fi diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 11c9e17a..4df3ab96 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -96,12 +96,12 @@ else NMTST_USE_VALGRIND=0 fi - if [ -n "${NMTST_LIBTOOL-:x}" ]; then - NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" --mode=execute) - elif [ -n "${NMTST_LIBTOOL-x}" ]; then + if [ -z "${NMTST_LIBTOOL+x}" ]; then + NMTST_LIBTOOL=(sh "$SCRIPT_PATH/../libtool" "--mode=execute") + elif [ -z "$NMTST_LIBTOOL" ]; then NMTST_LIBTOOL=() else - NMTST_LIBTOOL=($NMTST_LIBTOOL --mode=execute) + NMTST_LIBTOOL=("$NMTST_LIBTOOL" "--mode=execute") fi unset TEST while test $# -gt 0; do |