Re: 2.41 branch approaching

[Matthias Klose <doko@debian.org>]

[-- Attachment #1: Type: text/plain, Size: 1657 bytes --]

On 28.06.23 17:59, Nick Clifton wrote:
> Hi Matthias,
> 
>>> Can you supply the binutils.log file for a failing test run so
>>> that I can take a look ?
>>
>> attached, however it only points to the first fail in these two test cases.
> Hmm, OK, so if I am reading the log correctly the addr2line failures are
> happening because running:
> 
>    addr2line -e tmpdir/testprog <some address>
> 
> returns:
> 
>    ./builddir-single/binutils/./binutils/testsuite/binutils-all/testprog.c:<some 
> line number>
> 
> whereas the regexp is expecting to match:
> 
>   "$srcdir/$subdir/testprog.c:\[0-9\]+"
> 
> which translates to:
> 
>    
> /home/packages/binutils/binutils-2.40.50.20230628/binutils/testsuite/binutils-all/testprog.c:[0-9]+
> 
> Looking back in the log I notice that the test program is being compiled
> with:
> 
>    x86_64-linux-gnu-gcc \
>     
> /home/packages/binutils/binutils-2.40.50.20230628/binutils/testsuite/binutils-all/testprog.c \
>     -g \
>     -O2 \
>     -ffile-prefix-map=/home/packages/binutils/binutils-2.40.50.20230628=. \
>     -O0 \
>     -g \
>     -lm \
>     -o tmpdir/testprog
> 
> (I added the backslash line separators).
> 
> And so the culprit appears to be the -ffile-prefix-map... option.  Which I think
> must be coming from your environment as it is not a normal part of the binutils
> testsuite.
> 
> Does this make sense ?
> 
> I suspect that the same problem explains why the objdump+source+listing tests
> are failing.  The sources are not where the built binaries are saying that they
> should be.

yes, now explicitly filtering out this flag for the tests, patch attached.

Matthias

[-- Attachment #2: check-without-file-prefix-map.diff --]
[-- Type: text/x-patch, Size: 2204 bytes --]

--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -214,7 +214,7 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CC_FOR_BUILD="$(CC_FOR_BUILD)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET)) -O0" \
 		$(RUNTESTFLAGS); \
 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 	fi
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -1840,7 +1840,7 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CC_FOR_BUILD="$(CC_FOR_BUILD)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET) -O0" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET)) -O0" \
 		$(RUNTESTFLAGS); \
 	else echo "WARNING: could not find \`runtest'" 1>&2; :;\
 	fi
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -992,9 +992,9 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET))" \
 		CXX_FOR_TARGET="$(CXX_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CXXFLAGS_FOR_TARGET))" \
 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
 		SFRAMELIB="$(TESTSFRAMELIB)" \
 		JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2690,9 +2690,9 @@ check-DEJAGNU: site.exp
 		CC="$(CC)" CFLAGS="$(CFLAGS)" \
 		CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
 		CC_FOR_TARGET="$(CC_FOR_TARGET)" \
-		CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
+		CFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CFLAGS_FOR_TARGET))" \
 		CXX_FOR_TARGET="$(CXX_FOR_TARGET)" \
-		CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
+		CXXFLAGS_FOR_TARGET="$(filter-out -ffile-prefix-map=%,$(CXXFLAGS_FOR_TARGET))" \
 		OFILES="$(OFILES)" BFDLIB="$(TESTBFDLIB)" CTFLIB="$(TESTCTFLIB) $(ZLIB)" \
 		SFRAMELIB="$(TESTSFRAMELIB)" \
 		JANSSON_LIBS="$(JANSSON_LIBS)" ZSTD_LIBS="$(ZSTD_LIBS)" \