Messages in this thread Patch in this message | | | From | Nicholas Fraser <> | Subject | [PATCH 2/2] perf buildid-cache: Add test for PE executable | Date | Fri, 19 Feb 2021 11:10:34 -0500 |
| |
This builds on the previous changes to tests/shell/buildid.sh, adding tests for a PE file. It adds it to the build-id cache manually and, if Wine is available, runs it under "perf record" and verifies that it was added automatically.
If wine is not installed, only warnings are printed; the test can still exit 0.
(I welcome ways to make the GUID parsing less awful. checkpatch.pl is complaining about the line length of the sed command. The re-arranging could be done via e.g. id=${id:6:2}{id:4:2}... since this style is already used in the script but that turns out to be longer than the sed command and anyway it's bash-specific. This uses a hardcoded .exe so we could also just hardcode its GUID but I'd worry about making the tests too inflexible.)
Signed-off-by: Nicholas Fraser <nfraser@codeweavers.com> --- tools/perf/tests/shell/buildid.sh | 43 +++++++++++++++++++++++++++---- 1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/tools/perf/tests/shell/buildid.sh b/tools/perf/tests/shell/buildid.sh index 416af614bbe0..55e2168ef26f 100755 --- a/tools/perf/tests/shell/buildid.sh +++ b/tools/perf/tests/shell/buildid.sh @@ -14,18 +14,41 @@ if ! [ -x "$(command -v cc)" ]; then exit 2 fi +# check what we need to test windows binaries +add_pe=1 +run_pe=1 +if ! perf version --build-options | grep -q 'libbfd: .* on '; then + echo "WARNING: perf not built with libbfd. PE binaries will not be tested." + add_pe=0 + run_pe=0 +fi +if ! which wine > /dev/null; then + echo "WARNING: wine not found. PE binaries will not be run." + run_pe=0 +fi + ex_md5=$(mktemp /tmp/perf.ex.MD5.XXX) ex_sha1=$(mktemp /tmp/perf.ex.SHA1.XXX) +ex_pe=$(dirname $0)/../pe-file.exe echo 'int main(void) { return 0; }' | cc -Wl,--build-id=sha1 -o ${ex_sha1} -x c - echo 'int main(void) { return 0; }' | cc -Wl,--build-id=md5 -o ${ex_md5} -x c - -echo "test binaries: ${ex_sha1} ${ex_md5}" +echo "test binaries: ${ex_sha1} ${ex_md5} ${ex_pe}" check() { - id=`readelf -n ${1} 2>/dev/null | grep 'Build ID' | awk '{print $3}'` - + case $1 in + *.exe) + # the build id must be rearranged into a GUID + id=`objcopy -O binary --only-section=.buildid $1 /dev/stdout | \ + cut -c 33-48 | hexdump -ve '/1 "%02x"' | \ + sed 's@^\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(..\)\(.*\)0a$@\4\3\2\1\6\5\8\7\9@'` + ;; + *) + id=`readelf -n ${1} 2>/dev/null | grep 'Build ID' | awk '{print $3}'` + ;; + esac echo "build id: ${id}" link=${build_id_dir}/.build-id/${id:0:2}/${id:2} @@ -50,7 +73,7 @@ check() exit 1 fi - ${perf} buildid-cache -l | grep $id + ${perf} buildid-cache -l | grep ${id} if [ $? -ne 0 ]; then echo "failed: ${id} is not reported by \"perf buildid-cache -l\"" exit 1 @@ -81,7 +104,7 @@ test_record() build_id_dir=$(mktemp -d /tmp/perf.debug.XXX) perf="perf --buildid-dir ${build_id_dir}" - ${perf} record --buildid-all -o ${data} ${1} + ${perf} record --buildid-all -o ${data} ${2} ${1} if [ $? -ne 0 ]; then echo "failed: record ${1}" exit 1 @@ -96,12 +119,22 @@ test_record() # add binaries manual via perf buildid-cache -a test_add ${ex_sha1} test_add ${ex_md5} +if [ $add_pe -eq 1 ]; then + test_add ${ex_pe} +fi # add binaries via perf record post processing test_record ${ex_sha1} test_record ${ex_md5} +if [ $run_pe -eq 1 ]; then + test_record ${ex_pe} wine +fi # cleanup rm ${ex_sha1} ${ex_md5} +if [ $add_pe -eq 0 ] || [ $run_pe -eq 0 ]; then + echo "WARNING: some PE tests were skipped. See previous warnings." +fi + exit ${err} -- 2.30.1
| |