From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17037 invoked by alias); 1 Mar 2019 18:00:40 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 16755 invoked by uid 89); 1 Mar 2019 18:00:24 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS,WEIRD_QUOTING autolearn=ham version=3.3.2 spammy=hl, *sh, s1, ls X-Spam-Status: No, score=-26.9 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS,WEIRD_QUOTING autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Subject: Re: [PATCH] Add testsuite To: Jakub Jelinek Cc: dwz@sourceware.org References: <20190227201837.GA22456@delia> <20190227202302.GW7611@tucnak> From: Tom de Vries Message-ID: Date: Tue, 01 Jan 2019 00:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.3.0 MIME-Version: 1.0 In-Reply-To: <20190227202302.GW7611@tucnak> Content-Type: multipart/mixed; boundary="------------0097D8419144C6ACE3709FA5" Content-Language: en-US X-SW-Source: 2019-q1/txt/msg00057.txt.bz2 This is a multi-part message in MIME format. --------------0097D8419144C6ACE3709FA5 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 930 On 27-02-19 21:23, Jakub Jelinek wrote: > On Wed, Feb 27, 2019 at 09:18:39PM +0100, Tom de Vries wrote: >> this patch adds a basic dejagnu testsuite for dwz: >> ... >> $ make check >> $ cat dwz.sum >> ... >> Running testsuite/dwz.tests/dwz-tests.exp ... >> PASS: testsuite/dwz.tests/regular.sh >> PASS: testsuite/dwz.tests/low-mem.sh >> PASS: testsuite/dwz.tests/multifile.sh >> PASS: testsuite/dwz.tests/too-many-dies.sh >> PASS: testsuite/dwz.tests/hardlink.sh >> >> === dwz Summary === >> >> nr of expected passes 5 >> ... >> >> OK for trunk? > > Ok, thanks. A minor update of this patch, with obvious changes: - bug fix: the file hello was not compiled with -g (which I didn't notice because dwarf information from libraries was picked up). - addition of variable TEST_EXECS in Makefile - make gnu-debugaltlink-name.sh robust against files without .gnu_debugaltlink section Thanks, - Tom --------------0097D8419144C6ACE3709FA5 Content-Type: text/x-patch; name="0001-Add-testsuite.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-Add-testsuite.patch" Content-length: 5744 Add testsuite Add basic dejagnu testsuite for dwz: ... $ make check $ cat dwz.sum ... Running testsuite/dwz.tests/dwz-tests.exp ... PASS: testsuite/dwz.tests/regular.sh PASS: testsuite/dwz.tests/low-mem.sh PASS: testsuite/dwz.tests/multifile.sh PASS: testsuite/dwz.tests/too-many-dies.sh PASS: testsuite/dwz.tests/hardlink.sh === dwz Summary === nr of expected passes 5 ... 2019-02-27 Tom de Vries PR dwz/24277 * Makefile (check): Add target. * hello.c: New test. * testsuite/lib/dwz.exp: New dejagnu tool config file. * testsuite/scripts/gnu-debugaltlink-name.sh: New script. * testsuite/scripts/smaller-than.sh: New script. * testsuite/dwz.tests/dwz-tests.exp: New file. * testsuite/dwz.tests/hardlink.sh: New test. * testsuite/dwz.tests/low-mem.sh: New test. * testsuite/dwz.tests/multifile.sh: New test. * testsuite/dwz.tests/regular.sh: New test. * testsuite/dwz.tests/too-many-dies.sh: New test. --- Makefile | 14 ++++++++++++++ hello.c | 8 ++++++++ testsuite/dwz.tests/dwz-tests.exp | 21 +++++++++++++++++++++ testsuite/dwz.tests/hardlink.sh | 21 +++++++++++++++++++++ testsuite/dwz.tests/low-mem.sh | 13 +++++++++++++ testsuite/dwz.tests/multifile.sh | 20 ++++++++++++++++++++ testsuite/dwz.tests/regular.sh | 13 +++++++++++++ testsuite/dwz.tests/too-many-dies.sh | 13 +++++++++++++ testsuite/lib/dwz.exp | 0 testsuite/scripts/gnu-debugaltlink-name.sh | 11 +++++++++++ testsuite/scripts/smaller-than.sh | 13 +++++++++++++ 11 files changed, 147 insertions(+) diff --git a/Makefile b/Makefile index fbac9b5..bc51ca2 100644 --- a/Makefile +++ b/Makefile @@ -14,3 +14,17 @@ install: dwz install -D -m 644 dwz.1 $(DESTDIR)$(mandir)/man1/dwz.1 clean: rm -f $(OBJECTS) *~ core* dwz + +PWD:=$(shell pwd -P) + +TEST_EXECS = hello + +hello: + $(CC) hello.c -o $@ -g + +check: dwz $(TEST_EXECS) + mkdir -p testsuite-bin + cd testsuite-bin; ln -sf $(PWD)/dwz . + export PATH=$(PWD)/testsuite-bin:$$PATH; \ + runtest --tool=dwz -srcdir testsuite + rm -Rf testsuite-bin $(TEST_EXECS) diff --git a/hello.c b/hello.c new file mode 100644 index 0000000..82d070e --- /dev/null +++ b/hello.c @@ -0,0 +1,8 @@ +#include + +int +main (void) +{ + printf ("hello\n"); + return 0; +} diff --git a/testsuite/dwz.tests/dwz-tests.exp b/testsuite/dwz.tests/dwz-tests.exp new file mode 100644 index 0000000..3f0c4d9 --- /dev/null +++ b/testsuite/dwz.tests/dwz-tests.exp @@ -0,0 +1,21 @@ +set tests [find $srcdir/$subdir *.sh] + +set pwd [pwd] + +set env(PATH) $pwd/$srcdir/scripts:$::env(PATH) + +foreach test $tests { + set dir [exec basename $test] + set dir $pwd/tmp.$dir + exec rm -Rf $dir + exec mkdir $dir + + cd $dir + if { [catch { exec ../$test } msg] } { + puts "$msg" + fail "$test" + } else { + pass "$test" + exec rm -Rf $dir + } +} diff --git a/testsuite/dwz.tests/hardlink.sh b/testsuite/dwz.tests/hardlink.sh new file mode 100755 index 0000000..de339b9 --- /dev/null +++ b/testsuite/dwz.tests/hardlink.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +set -e + +cp ../hello 1 +ln 1 2 + +dwz -h 1 2 + +smaller-than.sh 1 ../hello +smaller-than.sh 2 ../hello + +hl="$(find -samefile 1)" +hl="$(echo $hl)" +[ "$hl" = "./1 ./2" ] + +ls=$(ls) +ls=$(echo $ls) +[ "$ls" = "1 2" ] + +rm -f 1 2 diff --git a/testsuite/dwz.tests/low-mem.sh b/testsuite/dwz.tests/low-mem.sh new file mode 100755 index 0000000..d042f7b --- /dev/null +++ b/testsuite/dwz.tests/low-mem.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +cp ../hello 1 + +dwz -l0 1 + +smaller-than.sh 1 ../hello + +[ $(ls) = "1" ] + +rm -f 1 diff --git a/testsuite/dwz.tests/multifile.sh b/testsuite/dwz.tests/multifile.sh new file mode 100755 index 0000000..5c54d0f --- /dev/null +++ b/testsuite/dwz.tests/multifile.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +set -e + +cp ../hello 1 +cp ../hello 2 + +dwz -m 3 1 2 + +smaller-than.sh 1 ../hello +smaller-than.sh 2 ../hello + +ls=$(ls) +ls=$(echo $ls) +[ "$ls" = "1 2 3" ] + +[ $(gnu-debugaltlink-name.sh 1) = "3" ] +[ $(gnu-debugaltlink-name.sh 2) = "3" ] + +rm -f 1 2 3 diff --git a/testsuite/dwz.tests/regular.sh b/testsuite/dwz.tests/regular.sh new file mode 100755 index 0000000..58a2b63 --- /dev/null +++ b/testsuite/dwz.tests/regular.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +cp ../hello 1 + +dwz 1 + +smaller-than.sh 1 ../hello + +[ $(ls) = "1" ] + +rm -f 1 diff --git a/testsuite/dwz.tests/too-many-dies.sh b/testsuite/dwz.tests/too-many-dies.sh new file mode 100755 index 0000000..2f9e4a2 --- /dev/null +++ b/testsuite/dwz.tests/too-many-dies.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +cp ../hello 1 + +if dwz -L0 1 2>/dev/null; then exit 1; fi + +cmp 1 ../hello + +[ "$(ls)" = "1" ] + +rm -f 1 diff --git a/testsuite/lib/dwz.exp b/testsuite/lib/dwz.exp new file mode 100644 index 0000000..e69de29 diff --git a/testsuite/scripts/gnu-debugaltlink-name.sh b/testsuite/scripts/gnu-debugaltlink-name.sh new file mode 100755 index 0000000..d99a970 --- /dev/null +++ b/testsuite/scripts/gnu-debugaltlink-name.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if ! readelf -S $1 | grep -q '\.gnu_debugaltlink'; then + exit +fi + +readelf \ + --string-dump=.gnu_debugaltlink \ + $1 \ + | grep -a '\[[ ]*0\]' \ + | awk '{$1="";$2=""; print;}' diff --git a/testsuite/scripts/smaller-than.sh b/testsuite/scripts/smaller-than.sh new file mode 100755 index 0000000..b3672a5 --- /dev/null +++ b/testsuite/scripts/smaller-than.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +f1=$1 +f2=$2 + +s1=$(ls -l $f1 | awk '{print $5}') +s2=$(ls -l $f2 | awk '{print $5}') + +if [ $s1 -ge $s2 ]; then + exit 1 +fi + +exit 0 --------------0097D8419144C6ACE3709FA5--