From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 116643 invoked by alias); 12 Dec 2019 10:49:30 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 116631 invoked by uid 89); 12 Dec 2019 10:49:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-Spam-Status: No, score=-25.2 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Subject: [committed] Use TEST_EXECS_$(UNAME) in Makefile To: Jakub Jelinek Cc: dwz@sourceware.org References: <20191211221242.GX10088@tucnak> <5ccf75f9-fb4b-e91a-79f1-16ccfa6e991c@suse.de> <20191212092013.GF10088@tucnak> From: Tom de Vries 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: Date: Tue, 01 Jan 2019 00:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <20191212092013.GF10088@tucnak> Content-Type: multipart/mixed; boundary="------------F34EC083EC6E429A08B00F81" Content-Language: en-US X-SW-Source: 2019-q4/txt/msg00157.txt.bz2 This is a multi-part message in MIME format. --------------F34EC083EC6E429A08B00F81 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 874 [ was: Re: [committed] Only compile test-cases using hardcoded assembly for x86_64 ] On 12-12-2019 10:20, Jakub Jelinek wrote: > On Thu, Dec 12, 2019 at 10:07:16AM +0100, Tom de Vries wrote: >> 2019-12-12 Tom de Vries >> >> * Makefile (UNAME): New variable. >> (dw2-restrict, dw2-skip-prologue, py-section-script) >> (implptr-64bit-d2o4a8r8t0, varval): Only compile for x86_64. > > I meant something shorter/easier to use, like: > TEST_EXECS_x86_64 = dw2-restrict py-section-script dw2-skip-prologue \ > implptr-64bit-d2o4a8r8t0 varval > TEST_EXECS = hello dwz-for-test min two-typedef start hello-gold-gdb-index \ > start-gold hello-gnu-pubnames $(TEST_EXECS_DWARF_ASM) \ > $(TEST_EXECS_$(UNAME)) > which would be easily extensible for tests specific to other architectures. Ack, committed patch that uses that approach. Thanks, - Tom --------------F34EC083EC6E429A08B00F81 Content-Type: text/x-patch; charset=UTF-8; name="0001-Use-TEST_EXECS_-UNAME-in-Makefile.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-Use-TEST_EXECS_-UNAME-in-Makefile.patch" Content-length: 3555 Use TEST_EXECS_$(UNAME) in Makefile Currently we test for $(UNAME) == x86_64 in some make targets. Instead, filter them out in TEST_EXECS, by means of moving them to TEST_EXECS_x86_64 and including them conditionally using $(TEST_EXECS_$(UNAME)). Also tested with UNAME setting commented out in Makefile to test behaviour on non-x86_64 architectures. 2019-12-12 Tom de Vries * Makefile (TEST_EXECS_x86_64): New variable, factored out of ... (TEST_EXECS): ... here. Include TEST_EXECS_x86_64 conditionally using $(TEST_EXECS_$(UNAME)). * testsuite/dwz.tests/dwz-tests.exp: Handle missing required executables. Add missing break in foreach. --- Makefile | 29 +++++++++++------------------ testsuite/dwz.tests/dwz-tests.exp | 6 ++++++ 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 34c4b47..770824b 100644 --- a/Makefile +++ b/Makefile @@ -27,9 +27,11 @@ PWD:=$(shell pwd -P) TEST_SRC = $(srcdir)/testsuite/dwz.tests TEST_EXECS_DWARF_ASM = no-multifile-prop invalid-dw-at-stmt-list-encoding -TEST_EXECS = hello py-section-script dwz-for-test min two-typedef \ - dw2-skip-prologue start implptr-64bit-d2o4a8r8t0 hello-gold-gdb-index \ - start-gold hello-gnu-pubnames varval $(TEST_EXECS_DWARF_ASM) +TEST_EXECS_x86_64 = py-section-script dw2-skip-prologue \ + implptr-64bit-d2o4a8r8t0 varval +TEST_EXECS = hello dwz-for-test min two-typedef start hello-gold-gdb-index \ + start-gold hello-gnu-pubnames $(TEST_EXECS_DWARF_ASM) \ + $(TEST_EXECS_$(UNAME)) UNAME:=$(shell uname -p) @@ -40,16 +42,11 @@ hello-gnu-pubnames: $(CC) $(TEST_SRC)/hello.c -o $@ -g -ggnu-pubnames || touch $@ dw2-skip-prologue: - if [ $(UNAME) = "x86_64" ]; then \ - $(CC) $(TEST_SRC)/dw2-skip-prologue.S \ - $(TEST_SRC)/dw2-skip-prologue.c \ - -DINLINED -DPTRBITS=64 -o $@; \ - else touch $@; fi + $(CC) $(TEST_SRC)/dw2-skip-prologue.S $(TEST_SRC)/dw2-skip-prologue.c \ + -DINLINED -DPTRBITS=64 -o $@ py-section-script: - if [ $(UNAME) = "x86_64" ]; then \ - $(CC) $(TEST_SRC)/py-section-script.s -o $@ -g ; \ - else touch $@; fi + $(CC) $(TEST_SRC)/py-section-script.s -o $@ -g DWZ_TEST_SOURCES := $(patsubst %.o,%-for-test.c,$(OBJECTS)) @@ -75,19 +72,15 @@ start-gold: $(CC) $(TEST_SRC)/start.c -fuse-ld=gold -o $@ -g -nostdlib || touch $@ implptr-64bit-d2o4a8r8t0: - if [ $(UNAME) = "x86_64" ]; then \ - $(CC) $(TEST_SRC)/implptr-64bit-d2o4a8r8t0.S $(TEST_SRC)/main.c \ - -o $@ -g; \ - else touch $@; fi + $(CC) $(TEST_SRC)/implptr-64bit-d2o4a8r8t0.S $(TEST_SRC)/main.c \ + -o $@ -g hello-gold-gdb-index: $(CC) $(TEST_SRC)/hello.c -g -fuse-ld=gold -Wl,--gdb-index -o $@ \ || touch $@ varval: - if [ $(UNAME) = "x86_64" ]; then \ - $(CC) $(TEST_SRC)/varval.c $(TEST_SRC)/varval.S -g -o $@; \ - else touch $@; fi + $(CC) $(TEST_SRC)/varval.c $(TEST_SRC)/varval.S -g -o $@ POINTER_SIZE:=$(shell $(CC) $(TEST_SRC)/pointer-size.c -o pointer-size; \ ./pointer-size; \ diff --git a/testsuite/dwz.tests/dwz-tests.exp b/testsuite/dwz.tests/dwz-tests.exp index a7e2dee..2e5d19a 100644 --- a/testsuite/dwz.tests/dwz-tests.exp +++ b/testsuite/dwz.tests/dwz-tests.exp @@ -84,9 +84,15 @@ foreach test $tests { set unsupported 0 foreach required_exec $required_execs { + set exists [file exists $required_exec] + if { $exists == 0 } { + set unsupported 1 + break + } set size [file size $required_exec] if { $size == 0 } { set unsupported 1 + break } } if { $unsupported == 1 } { --------------F34EC083EC6E429A08B00F81--