From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 42B8438708EE; Sat, 15 Jun 2024 06:10:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 42B8438708EE DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1718431801; bh=7W4y+RnAHd1AyWYb1wEtm67B8BFBTuZYi+tFBK60sQI=; h=From:To:Subject:Date:From; b=X0PnFLpEDfxt81wv3B8ezpfQfH3rWFs69zuxGepYZfJMb+kdlINSmhd35u9UMHAFl INFw11t5zImykkPahvtMwMPF+u8PkQyrmp8hBWbpRVhcWizRuXgVRj/Sq61sxmeMRz TkjAAtMS8O/zFawB3IOmHKHKuMA/QTYjwm4Uu5Z8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb/testsuite] Clean up gdb/contrib/expect-read1.sh X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: f2869f51b2ee7fc9357c2030add11435d7f1beef X-Git-Newrev: 486df2b7c88e3a08d3d799b1595b5fd0dce41d6f Message-Id: <20240615061001.42B8438708EE@sourceware.org> Date: Sat, 15 Jun 2024 06:10:01 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D486df2b7c88e= 3a08d3d799b1595b5fd0dce41d6f commit 486df2b7c88e3a08d3d799b1595b5fd0dce41d6f Author: Tom de Vries Date: Sat Jun 15 08:10:44 2024 +0200 [gdb/testsuite] Clean up gdb/contrib/expect-read1.sh =20 Clean up script gdb/contrib/expect-read1.sh by: - fixing shellcheck warnings, - using mktemp (which takes TMPDIR into account) instead of a hardcoded "/tmp/expect-read1.$$.so", - adding comments, and - adding emacs / vi settings for local tab size 2 (copied from ./ltmain= .sh). =20 Tested on x86_64-linux. =20 Approved-by: Kevin Buettner Diff: --- gdb/contrib/expect-read1.sh | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gdb/contrib/expect-read1.sh b/gdb/contrib/expect-read1.sh index 890a1cdbd07..82c638c59d2 100755 --- a/gdb/contrib/expect-read1.sh +++ b/gdb/contrib/expect-read1.sh @@ -26,17 +26,32 @@ # or # bash$ EXPECT=3D../contrib/expect-read1.sh runtest =20 -C=3D`echo $0|sed 's/\.sh$/.c/'` -if ! test -e $C; then +# Find source file. +C=3D$(echo "$0" | sed 's/\.sh$/.c/') +if ! test -e "$C"; then echo >&2 "$0: Cannot find 'srcdir/gdb/contrib/expect-read1.c' at '$C'." exit 2 fi -SO=3D/tmp/expect-read1.$$.so -rm -f $SO + +# Create temp directory. +tmpdir=3D$(mktemp -d) + +# Schedule cleanup. +trap 'rm -rf $tmpdir' EXIT + +# Compile shared library. +SO=3D$tmpdir/expect-read1.so CMD=3D"${CC_FOR_TARGET:-gcc} -o $SO -Wall -fPIC -shared $C" if ! $CMD; then echo >&2 "$0: Failed: $CMD" exit 2 fi -trap "rm -f $SO" EXIT + +# Call expect with the shared library preloaded. LD_PRELOAD=3D$SO expect "$@" + +# Local Variables: +# mode:shell-script +# sh-indentation:2 +# End: +# vi:sw=3D2