aboutsummaryrefslogtreecommitdiff
path: root/gdb/contrib
diff options
context:
space:
mode:
authorSimon Marchi <simon.marchi@efficios.com>2019-05-10 16:29:00 -0400
committerSimon Marchi <simon.marchi@efficios.com>2019-05-10 16:29:40 -0400
commita9eac7f9b45e92b83db476d167e5ff26607a8b47 (patch)
tree00b98a987371db3284f28850c55925f35166b635 /gdb/contrib
parenta97c8e56362b77fcbbf5b57e5053356320273977 (diff)
downloadgdb-a9eac7f9b45e92b83db476d167e5ff26607a8b47.zip
gdb-a9eac7f9b45e92b83db476d167e5ff26607a8b47.tar.gz
gdb-a9eac7f9b45e92b83db476d167e5ff26607a8b47.tar.bz2
cc-with-tweaks: show dwz stderr and verify result
When running the gdb.base/index-cache.exp test case with the cc-with-dwz-m board, I noticed that the final executable didn't actually contain a .gnu_debugaltlink section with the name of the external dwz file: $ readelf --debug-dump=links testsuite/outputs/gdb.base/index-cache/index-cache * empty * Running dwz by hand, I realized it's because dwz complains that the output .debug_info section is empty and fails: $ gcc ~/src/binutils-gdb/gdb/testsuite/gdb.base/index-cache.c -g3 -O0 -o a && cp a b $ dwz -m foo a b dwz: foo: .debug_info section not present $ echo $? 1 This is because index-cache.c is trivial (just an empty main) and dwz doesn't find anything to factor out to the dwz file. [1] I think that cc-with-tweaks should fail in this scenario: if the user asks for an external dwz file to be generated (the -m flag), then it should be an error if cc-with-tweaks doesn't manage to produce an executable with the proper link to this external dwz file. Otherwise, the test runs with a regular non-dwzified executable, which gives a false sense of security about whether the feature under test works with dwzified executables. So this patch adds checks for that after invoking dwz. It also removes the 2>&1 to allow the error message to be printed like so: Running /home/smarchi/src/binutils-gdb/gdb/testsuite/gdb.base/index-cache.exp ... gdb compile failed, dwz: /home/smarchi/build/binutils-gdb/gdb/testsuite/outputs/gdb.base/index-cache/index-cache.dwz: .debug_info section not present - In the -m case (multi-file compression), we check if the expected output file exists. - In the -z case (single-file compression), we check if the file contents has changed. This should catch cases where dwz doesn't modify the file because it's not worth it. It was chosen not to check for dwz's exit code, as it is not very reliable up to dwz 0.12. With this patch, fewer tests will pass than before with the cc-with-dwz and cc-with-dwz-m boards, but those were false positives anyway, as the test ran with regular executables. [1] Note that dwz has been patched by Tom de Vries to work correctly in this case, so we can use dwz master to run the test: https://sourceware.org/git/?p=dwz.git;a=commit;h=08becc8b33453b6d013a65e7eeae57fc1881e801 gdb/ChangeLog: * contrib/cc-with-tweaks.sh: Validate dwz's work.
Diffstat (limited to 'gdb/contrib')
-rwxr-xr-xgdb/contrib/cc-with-tweaks.sh34
1 files changed, 32 insertions, 2 deletions
diff --git a/gdb/contrib/cc-with-tweaks.sh b/gdb/contrib/cc-with-tweaks.sh
index 47379cc..7df16bc 100755
--- a/gdb/contrib/cc-with-tweaks.sh
+++ b/gdb/contrib/cc-with-tweaks.sh
@@ -180,11 +180,41 @@ if [ "$want_index" = true ]; then
fi
if [ "$want_dwz" = true ]; then
- $DWZ "$output_file" > /dev/null 2>&1
+ # Validate dwz's result by checking if the executable was modified.
+ cp "$output_file" "${output_file}.copy"
+ $DWZ "$output_file" > /dev/null
+ cmp "$output_file" "$output_file.copy" > /dev/null
+ cmp_rc=$?
+ rm -f "${output_file}.copy"
+
+ case $cmp_rc in
+ 0)
+ echo "$myname: dwz did not modify ${output_file}."
+ exit 1
+ ;;
+ 1)
+ # File was modified, great.
+ ;;
+ *)
+ # Other cmp error, it presumably has already printed something on
+ # stderr.
+ exit 1
+ ;;
+ esac
elif [ "$want_multi" = true ]; then
+ # Remove the dwz output file if it exists, so we don't mistake it for a
+ # new file in case dwz fails.
+ rm -f "${output_file}.dwz"
+
cp $output_file ${output_file}.alt
- $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null 2>&1
+ $DWZ -m ${output_file}.dwz "$output_file" ${output_file}.alt > /dev/null
rm -f ${output_file}.alt
+
+ # Validate dwz's work by checking if the expected output file exists.
+ if [ ! -f "${output_file}.dwz" ]; then
+ echo "$myname: dwz file ${output_file}.dwz missing."
+ exit 1
+ fi
fi
if [ "$want_dwp" = true ]; then