diff options
| author | Guy Harris <guy@alum.mit.edu> | 2018-04-24 20:58:02 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-04-25 04:24:21 +0000 |
| commit | 372b8202555806287dc38ba35e5df10c5d82102a (patch) | |
| tree | 29699b3bdff99cbaa5dab34048b5372cba34c424 | |
| parent | 8930b986aa0b9c5d529a3e1072665a206db56cad (diff) | |
Get rid of more .libs stuff.
Again, no more autotools/libtool, so no more .libs, as that's a
libtoolism.
Change-Id: I909c18b969ca8e04a252ff45f7f3e6bc9d0c8476
Reviewed-on: https://code.wireshark.org/review/27138
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rwxr-xr-x | test/run_and_catch_crashes | 32 | ||||
| -rwxr-xr-x | tools/compare-abis.sh | 11 |
2 files changed, 5 insertions, 38 deletions
diff --git a/test/run_and_catch_crashes b/test/run_and_catch_crashes index 690706a9ab..8073b11b7e 100755 --- a/test/run_and_catch_crashes +++ b/test/run_and_catch_crashes @@ -64,18 +64,6 @@ echo last expr command was expr "$1" : ".*=.*" then # # Found the executable. - # Is it a libtool wrapper script? Look for a .libs - # directory. - # - executable_dirname=`dirname "$executable"` - if [ -d "$executable_dirname"/.libs ] - then - is_libtool_wrapper=yes - else - is_libtool_wrapper=no - fi - - # # Now, look for a debugger. # XXX - lldb? # @@ -87,18 +75,10 @@ echo last expr command was expr "$1" : ".*=.*" # cause the stack trace to go to the standard # error. # - if [ $is_libtool_wrapper = yes ] - then - $executable_dirname/libtool --mode=execute dbx "$executable" core 1>&2 <<EOF + dbx "$executable" core 1>&2 <<EOF where quit EOF - else - dbx "$executable" core 1>&2 <<EOF -where -quit -EOF - fi else gdb=`which gdb` if [ ! -z "$gdb" ] @@ -108,18 +88,10 @@ EOF # cause the stack trace to go to the standard # error. # - if [ $is_libtool_wrapper = yes ] - then - $executable_dirname/libtool --mode=execute gdb "$executable" core 1>&2 <<EOF -backtrace -quit -EOF - else - gdb "$executable" core 1>&2 <<EOF + gdb "$executable" core 1>&2 <<EOF backtrace quit EOF - fi fi fi fi diff --git a/tools/compare-abis.sh b/tools/compare-abis.sh index b820c8bd8c..8d18683c8a 100755 --- a/tools/compare-abis.sh +++ b/tools/compare-abis.sh @@ -32,17 +32,12 @@ function acc () { V1_PATH=$1 V2_PATH=$2 -# both working copies have to be built first with autotools or with cmake +# both working copies have to be built first with cmake # make -C $V1_PATH all dumpabi # make -C $V2_PATH all dumpabi -if test -d $V1_PATH/lib; then - REL_LIB_PATH=../lib - REL_DUMP_PATH=. -else - REL_LIB_PATH=.libs - REL_DUMP_PATH=.libs -fi +REL_LIB_PATH=../lib +REL_DUMP_PATH=. acc libwiretap wiretap $V1_PATH $V2_PATH RET=$? |