From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 928C538930D5 for ; Fri, 24 Apr 2020 09:32:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 928C538930D5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 09C44ADCE; Fri, 24 Apr 2020 09:32:41 +0000 (UTC) Subject: [committed][gdb/contrib] Use temp dir for gdb-add-index in cc-with-tweaks.sh From: Tom de Vries To: gdb-patches@sourceware.org References: <20200417114635.GA32265@delia> Autocrypt: addr=tdevries@suse.de; keydata= xsBNBF0ltCcBCADDhsUnMMdEXiHFfqJdXeRvgqSEUxLCy/pHek88ALuFnPTICTwkf4g7uSR7 HvOFUoUyu8oP5mNb4VZHy3Xy8KRZGaQuaOHNhZAT1xaVo6kxjswUi3vYgGJhFMiLuIHdApoc u5f7UbV+egYVxmkvVLSqsVD4pUgHeSoAcIlm3blZ1sDKviJCwaHxDQkVmSsGXImaAU+ViJ5l CwkvyiiIifWD2SoOuFexZyZ7RUddLosgsO0npVUYbl6dEMq2a5ijGF6/rBs1m3nAoIgpXk6P TCKlSWVW6OCneTaKM5C387972qREtiArTakRQIpvDJuiR2soGfdeJ6igGA1FZjU+IsM5ABEB AAHNH1RvbSBkZSBWcmllcyA8dGRldnJpZXNAc3VzZS5kZT7CwKsEEwEIAD4WIQSsnSe5hKbL MK1mGmjuhV2rbOJEoAUCXSW0JwIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAh CRDuhV2rbOJEoBYhBKydJ7mEpsswrWYaaO6FXats4kSgc48H/Ra2lq5p3dHsrlQLqM7N68Fo eRDf3PMevXyMlrCYDGLVncQwMw3O/AkousktXKQ42DPJh65zoXB22yUt8m0g12xkLax98KFJ 5NyUloa6HflLl+wQL/uZjIdNUQaHQLw3HKwRMVi4l0/Jh/TygYG1Dtm8I4o708JS4y8GQxoQ UL0z1OM9hyM3gI2WVTTyprsBHy2EjMOu/2Xpod95pF8f90zBLajy6qXEnxlcsqreMaqmkzKn 3KTZpWRxNAS/IH3FbGQ+3RpWkNGSJpwfEMVCeyK5a1n7yt1podd1ajY5mA1jcaUmGppqx827 8TqyteNe1B/pbiUt2L/WhnTgW1NC1QDOwE0EXSW0JwEIAM99H34Bu4MKM7HDJVt864MXbx7B 1M93wVlpJ7Uq+XDFD0A0hIal028j+h6jA6bhzWto4RUfDl/9mn1StngNVFovvwtfzbamp6+W pKHZm9X5YvlIwCx131kTxCNDcF+/adRW4n8CU3pZWYmNVqhMUiPLxElA6QhXTtVBh1RkjCZQ Kmbd1szvcOfaD8s+tJABJzNZsmO2hVuFwkDrRN8Jgrh92a+yHQPd9+RybW2l7sJv26nkUH5Z 5s84P6894ebgimcprJdAkjJTgprl1nhgvptU5M9Uv85Pferoh2groQEAtRPlCGrZ2/2qVNe9 XJfSYbiyedvApWcJs5DOByTaKkcAEQEAAcLAkwQYAQgAJhYhBKydJ7mEpsswrWYaaO6FXats 4kSgBQJdJbQnAhsMBQkDwmcAACEJEO6FXats4kSgFiEErJ0nuYSmyzCtZhpo7oVdq2ziRKD3 twf7BAQBZ8TqR812zKAD7biOnWIJ0McV72PFBxmLIHp24UVe0ZogtYMxSWKLg3csh0yLVwc7 H3vldzJ9AoK3Qxp0Q6K/rDOeUy3HMqewQGcqrsRRh0NXDIQk5CgSrZslPe47qIbe3O7ik/MC q31FNIAQJPmKXX25B115MMzkSKlv4udfx7KdyxHrTSkwWZArLQiEZj5KG4cCKhIoMygPTA3U yGaIvI/BGOtHZ7bEBVUCFDFfOWJ26IOCoPnSVUvKPEOH9dv+sNy7jyBsP5QxeTqwxC/1ZtNS DUCSFQjqA6bEGwM22dP8OUY6SC94x1G81A9/xbtm9LQxKm0EiDH8KBMLfQ== Message-ID: <386d2008-819b-7a90-d164-5b9a4dd40d5d@suse.de> Date: Fri, 24 Apr 2020 11:32:39 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 In-Reply-To: <20200417114635.GA32265@delia> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-28.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Apr 2020 09:32:43 -0000 On 17-04-2020 13:46, Tom de Vries wrote: > Hi, > > When running test-case gdb.dwarf2/gdb-index.exp cleanly by issuing this > command: > ... > $ rm -Rf build/gdb/testsuite/outputs/gdb.dwarf2/gdb-index > ... > before running, it passes both with native and target board > cc-with-gdb-index. > > But when we run the test-case first with native and then with > cc-with-gdb-index without intermediate cleanup, we get instead: > ... > Running src/gdb/testsuite/gdb.dwarf2/gdb-index.exp ... > gdb compile failed, cc-with-tweaks.sh: Index file \ > build/gdb/testsuite/outputs/gdb.dwarf2/gdb-index/gdb-index.gdb-index \ > exists, won't clobber. > > === gdb Summary === > > # of untested testcases 1 > ... > > What happens is that the native run produces a file > build/gdb/testsuite/outputs/gdb.dwarf2/gdb-index/gdb-index.gdb-index, which > causes gdb/contrib/cc-with-tweaks.sh to hit this code: > ... > index_file="${output_file}.gdb-index" > if [ "$want_index" = true ] && [ -f "$index_file" ] > then > echo "$myname: Index file $index_file exists, won't clobber." >&2 > exit 1 > fi > ... > > The gdb-add-index script has a problem that it uses temp files alongside the > executable, filed as PR25843. > > The code in cc-with-tweaks.sh attempts to detect the case that creating such a > temp file would overwrite an pre-existing file. It however does this only for > a single file, while gdb-add-index uses more temporary files: > - .gdb-index > - .debug_names > - .debug_str > - .debug_str.merge > - .debug_str.err > > Fix this by working around PR25843 in a more generic way: > - move the executable into a temp directory > - execute gdb-add-index, allowing it to create any temp file alongside the > executable in the temp directory > - move the executable back to the original location > > Tested on x86_64-linux, with target board cc-with-debug-index. > > Any comments? > Committed. Thanks, - Tom > > [gdb/contrib] Use temp dir for gdb-add-index in cc-with-tweaks.sh > > gdb/ChangeLog: > > 2020-04-17 Tom de Vries > > * contrib/cc-with-tweaks.sh: Remove .gdb-index file handling. > Run gdb-add-index inside temp dir. > > --- > gdb/contrib/cc-with-tweaks.sh | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh > index 7cad3ac7ee..2998a9d218 100755 > --- a/gdb/contrib/cc-with-tweaks.sh > +++ b/gdb/contrib/cc-with-tweaks.sh > @@ -144,13 +144,6 @@ then > exit $? > fi > > -index_file="${output_file}.gdb-index" > -if [ "$want_index" = true ] && [ -f "$index_file" ] > -then > - echo "$myname: Index file $index_file exists, won't clobber." >&2 > - exit 1 > -fi > - > output_dir="${output_file%/*}" > [ "$output_dir" = "$output_file" ] && output_dir="." > > @@ -176,12 +169,16 @@ if [ "$want_objcopy_compress" = true ]; then > fi > > if [ "$want_index" = true ]; then > + get_tmpdir > + mv "$output_file" "$tmpdir" > + tmpfile="$tmpdir/$(basename $output_file)" > # Filter out these messages which would stop dejagnu testcase run: > # echo "$myname: No index was created for $file" 1>&2 > # echo "$myname: [Was there no debuginfo? Was there already an index?]" 1>&2 > - GDB=$GDB $GDB_ADD_INDEX $index_options "$output_file" 2>&1 \ > + GDB=$GDB $GDB_ADD_INDEX $index_options "$tmpfile" 2>&1 \ > | grep -v "^${GDB_ADD_INDEX##*/}: " >&2 > rc=${PIPESTATUS[0]} > + mv "$tmpfile" "$output_file" > [ $rc != 0 ] && exit $rc > fi > > @@ -237,5 +234,4 @@ if [ "$want_dwp" = true ]; then > fi > fi > > -rm -f "$index_file" > exit $rc >