Diff of the two buildlogs:

--
--- b1/build.log	2025-02-15 08:41:25.165268418 +0000
+++ b2/build.log	2025-02-15 08:41:58.987747079 +0000
@@ -1,6 +1,6 @@
 I: pbuilder: network access will be disabled during build
-I: Current time: Fri Feb 14 20:40:15 -12 2025
-I: pbuilder-time-stamp: 1739608815
+I: Current time: Sat Mar 21 05:04:26 +14 2026
+I: pbuilder-time-stamp: 1774019066
 I: Building the build Environment
 I: extracting base tarball [/var/cache/pbuilder/trixie-reproducible-base.tgz]
 I: copying local configuration
@@ -26,54 +26,86 @@
 dpkg-source: info: applying gcc-driver.diff
 I: Not using root during the build.
 I: Installing the build-deps
-I: user script /srv/workspace/pbuilder/36954/tmp/hooks/D02_print_environment starting
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/D01_modify_environment starting
+debug: Running on ionos6-i386.
+I: Changing host+domainname to test build reproducibility
+I: Adding a custom variable just for the fun of it...
+I: Changing /bin/sh to bash
+'/bin/sh' -> '/bin/bash'
+lrwxrwxrwx 1 root root 9 Mar 20 15:04 /bin/sh -> /bin/bash
+I: Setting pbuilder2's login shell to /bin/bash
+I: Setting pbuilder2's GECOS to second user,second room,second work-phone,second home-phone,second other
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/D01_modify_environment finished
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/D02_print_environment starting
 I: set
-  BUILDDIR='/build/reproducible-path'
-  BUILDUSERGECOS='first user,first room,first work-phone,first home-phone,first other'
-  BUILDUSERNAME='pbuilder1'
-  BUILD_ARCH='i386'
-  DEBIAN_FRONTEND='noninteractive'
-  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=11 '
-  DISTRIBUTION='trixie'
-  HOME='/root'
-  HOST_ARCH='i386'
+  BASH=/bin/sh
+  BASHOPTS=checkwinsize:cmdhist:complete_fullquote:extquote:force_fignore:globasciiranges:globskipdots:hostcomplete:interactive_comments:patsub_replacement:progcomp:promptvars:sourcepath
+  BASH_ALIASES=()
+  BASH_ARGC=()
+  BASH_ARGV=()
+  BASH_CMDS=()
+  BASH_LINENO=([0]="12" [1]="0")
+  BASH_LOADABLES_PATH=/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:.
+  BASH_SOURCE=([0]="/tmp/hooks/D02_print_environment" [1]="/tmp/hooks/D02_print_environment")
+  BASH_VERSINFO=([0]="5" [1]="2" [2]="37" [3]="1" [4]="release" [5]="i686-pc-linux-gnu")
+  BASH_VERSION='5.2.37(1)-release'
+  BUILDDIR=/build/reproducible-path
+  BUILDUSERGECOS='second user,second room,second work-phone,second home-phone,second other'
+  BUILDUSERNAME=pbuilder2
+  BUILD_ARCH=i386
+  DEBIAN_FRONTEND=noninteractive
+  DEB_BUILD_OPTIONS='buildinfo=+all reproducible=+all parallel=21 '
+  DIRSTACK=()
+  DISTRIBUTION=trixie
+  EUID=0
+  FUNCNAME=([0]="Echo" [1]="main")
+  GROUPS=()
+  HOME=/root
+  HOSTNAME=i-capture-the-hostname
+  HOSTTYPE=i686
+  HOST_ARCH=i386
   IFS=' 	
   '
-  INVOCATION_ID='876996830e47494fbfd364a48263f707'
-  LANG='C'
-  LANGUAGE='en_US:en'
-  LC_ALL='C'
-  LD_LIBRARY_PATH='/usr/lib/libeatmydata'
-  LD_PRELOAD='libeatmydata.so'
-  MAIL='/var/mail/root'
-  OPTIND='1'
-  PATH='/usr/sbin:/usr/bin:/sbin:/bin:/usr/games'
-  PBCURRENTCOMMANDLINEOPERATION='build'
-  PBUILDER_OPERATION='build'
-  PBUILDER_PKGDATADIR='/usr/share/pbuilder'
-  PBUILDER_PKGLIBDIR='/usr/lib/pbuilder'
-  PBUILDER_SYSCONFDIR='/etc'
-  PPID='36954'
-  PS1='# '
-  PS2='> '
+  INVOCATION_ID=e460567923aa4f49aa026484d93bdc3f
+  LANG=C
+  LANGUAGE=de_CH:de
+  LC_ALL=C
+  LD_LIBRARY_PATH=/usr/lib/libeatmydata
+  LD_PRELOAD=libeatmydata.so
+  MACHTYPE=i686-pc-linux-gnu
+  MAIL=/var/mail/root
+  OPTERR=1
+  OPTIND=1
+  OSTYPE=linux-gnu
+  PATH=/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path
+  PBCURRENTCOMMANDLINEOPERATION=build
+  PBUILDER_OPERATION=build
+  PBUILDER_PKGDATADIR=/usr/share/pbuilder
+  PBUILDER_PKGLIBDIR=/usr/lib/pbuilder
+  PBUILDER_SYSCONFDIR=/etc
+  PIPESTATUS=([0]="0")
+  POSIXLY_CORRECT=y
+  PPID=59548
   PS4='+ '
-  PWD='/'
-  SHELL='/bin/bash'
-  SHLVL='2'
-  SUDO_COMMAND='/usr/bin/timeout -k 18.1h 18h /usr/bin/ionice -c 3 /usr/bin/nice /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.OYbkAbG9/pbuilderrc_OPDR --distribution trixie --hookdir /etc/pbuilder/first-build-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.OYbkAbG9/b1 --logfile b1/build.log debugedit_5.1-2.dsc'
-  SUDO_GID='112'
-  SUDO_UID='107'
-  SUDO_USER='jenkins'
-  TERM='unknown'
-  TZ='/usr/share/zoneinfo/Etc/GMT+12'
-  USER='root'
-  _='/usr/bin/systemd-run'
-  http_proxy='http://46.16.76.132:3128'
+  PWD=/
+  SHELL=/bin/bash
+  SHELLOPTS=braceexpand:errexit:hashall:interactive-comments:posix
+  SHLVL=3
+  SUDO_COMMAND='/usr/bin/timeout -k 24.1h 24h /usr/bin/ionice -c 3 /usr/bin/nice -n 11 /usr/bin/unshare --uts -- /usr/sbin/pbuilder --build --configfile /srv/reproducible-results/rbuild-debian/r-b-build.OYbkAbG9/pbuilderrc_GU8X --distribution trixie --hookdir /etc/pbuilder/rebuild-hooks --debbuildopts -b --basetgz /var/cache/pbuilder/trixie-reproducible-base.tgz --buildresult /srv/reproducible-results/rbuild-debian/r-b-build.OYbkAbG9/b2 --logfile b2/build.log debugedit_5.1-2.dsc'
+  SUDO_GID=112
+  SUDO_UID=107
+  SUDO_USER=jenkins
+  TERM=unknown
+  TZ=/usr/share/zoneinfo/Etc/GMT-14
+  UID=0
+  USER=root
+  _='I: set'
+  http_proxy=http://213.165.73.152:3128
 I: uname -a
-  Linux ionos2-i386 6.1.0-31-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux
+  Linux i-capture-the-hostname 6.1.0-31-amd64 #1 SMP PREEMPT_DYNAMIC Debian 6.1.128-1 (2025-02-07) x86_64 GNU/Linux
 I: ls -l /bin
-  lrwxrwxrwx 1 root root 7 Nov 22 14:40 /bin -> usr/bin
-I: user script /srv/workspace/pbuilder/36954/tmp/hooks/D02_print_environment finished
+  lrwxrwxrwx 1 root root 7 Nov 22  2024 /bin -> usr/bin
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/D02_print_environment finished
  -> Attempting to satisfy build-dependencies
  -> Creating pbuilder-satisfydepends-dummy package
 Package: pbuilder-satisfydepends-dummy
@@ -161,7 +193,7 @@
 Get: 40 http://deb.debian.org/debian trixie/main i386 libxxhash-dev i386 0.8.3-2 [88.0 kB]
 Get: 41 http://deb.debian.org/debian trixie/main i386 pkgconf-bin i386 1.8.1-4 [30.6 kB]
 Get: 42 http://deb.debian.org/debian trixie/main i386 pkgconf i386 1.8.1-4 [26.2 kB]
-Fetched 23.6 MB in 0s (64.3 MB/s)
+Fetched 23.6 MB in 0s (132 MB/s)
 Preconfiguring packages ...
 Selecting previously unselected package liblocale-gettext-perl.
 (Reading database ... 
(Reading database ... 5%
(Reading database ... 10%
(Reading database ... 15%
(Reading database ... 20%
(Reading database ... 25%
(Reading database ... 30%
(Reading database ... 35%
(Reading database ... 40%
(Reading database ... 45%
(Reading database ... 50%
(Reading database ... 55%
(Reading database ... 60%
(Reading database ... 65%
(Reading database ... 70%
(Reading database ... 75%
(Reading database ... 80%
(Reading database ... 85%
(Reading database ... 90%
(Reading database ... 95%
(Reading database ... 100%
(Reading database ... 19794 files and directories currently installed.)
@@ -344,7 +376,11 @@
 Building tag database...
  -> Finished parsing the build-deps
 I: Building the package
-I: Running cd /build/reproducible-path/debugedit-5.1/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games" HOME="/nonexistent/first-build" dpkg-genchanges -S  > ../debugedit_5.1-2_source.changes
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/A99_set_merged_usr starting
+Not re-configuring usrmerge for trixie
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/A99_set_merged_usr finished
+hostname: Name or service not known
+I: Running cd /build/reproducible-path/debugedit-5.1/ && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-buildpackage -us -uc -b && env PATH="/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/i/capture/the/path" HOME="/nonexistent/second-build" dpkg-genchanges -S  > ../debugedit_5.1-2_source.changes
 dpkg-buildpackage: info: source package debugedit
 dpkg-buildpackage: info: source version 1:5.1-2
 dpkg-buildpackage: info: source distribution unstable
@@ -466,7 +502,7 @@
 config.status: executing tests/atconfig commands
 config.status: executing depfiles commands
    dh_auto_build
-	make -j11
+	make -j21
 make[1]: Entering directory '/build/reproducible-path/debugedit-5.1'
 make  all-recursive
 make[2]: Entering directory '/build/reproducible-path/debugedit-5.1'
@@ -476,10 +512,10 @@
 make[3]: Leaving directory '/build/reproducible-path/debugedit-5.1/tests'
 make[3]: Entering directory '/build/reproducible-path/debugedit-5.1'
 (/usr/bin/sed -e 's,[@]PACKAGE[@],debugedit,g' -e 's,[@]VERSION[@],5.1,g' -e 's,[@]READELF[@],readelf,g' -e 's,[@]DWZ_J[@],-j,g') < "./scripts/find-debuginfo.in" > "find-debuginfo"
-chmod +x "find-debuginfo"
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/debugedit-5.1=. -specs=/usr/share/dpkg/no-pie-compile.specs -c -o tools/debugedit-debugedit.o `test -f 'tools/debugedit.c' || echo './'`tools/debugedit.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/debugedit-5.1=. -specs=/usr/share/dpkg/no-pie-compile.specs -c -o tools/debugedit-hashtab.o `test -f 'tools/hashtab.c' || echo './'`tools/hashtab.c
 gcc -DHAVE_CONFIG_H -I.   -Wdate-time -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/debugedit-5.1=. -specs=/usr/share/dpkg/no-pie-compile.specs -c -o tools/sepdebugcrcfix-sepdebugcrcfix.o `test -f 'tools/sepdebugcrcfix.c' || echo './'`tools/sepdebugcrcfix.c
+chmod +x "find-debuginfo"
 gcc -Wall -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/build/reproducible-path/debugedit-5.1=. -specs=/usr/share/dpkg/no-pie-compile.specs  -specs=/usr/share/dpkg/no-pie-link.specs -o sepdebugcrcfix tools/sepdebugcrcfix-sepdebugcrcfix.o -lelf  
 tools/debugedit.c: In function 'read_dwarf5_line_entries':
 tools/debugedit.c:1993:15: warning: argument 1 value '4294967292' exceeds maximum object size 2147483647 [-Walloc-size-larger-than=]
@@ -507,7 +543,7 @@
   cat tests/testsuite.log; \
   exit 1; \
 fi
-	make -j11 check "TESTSUITEFLAGS=-j11 --verbose" VERBOSE=1
+	make -j21 check "TESTSUITEFLAGS=-j21 --verbose" VERBOSE=1
 make[2]: Entering directory '/build/reproducible-path/debugedit-5.1'
 Making check in tests
 make[3]: Entering directory '/build/reproducible-path/debugedit-5.1/tests'
@@ -521,9 +557,9 @@
   echo 'm4_define([AT_PACKAGE_STRING],    [debugedit 5.1])'; \
   echo 'm4_define([AT_PACKAGE_BUGREPORT], [debugedit@sourceware.org])'; \
 } >./package.m4
-/bin/bash '/build/reproducible-path/debugedit-5.1/missing' autom4te --language=autotest -I . testsuite.at -o testsuite.tmp
+/bin/sh '/build/reproducible-path/debugedit-5.1/missing' autom4te --language=autotest -I . testsuite.at -o testsuite.tmp
 mv testsuite.tmp testsuite
-/bin/bash ./testsuite -j11 --verbose
+/bin/sh ./testsuite -j21 --verbose
 ## ------------------------- ##
 ## debugedit 5.1 test suite. ##
 ## ------------------------- ##
@@ -538,13 +574,34 @@
 
 
 
+
+
+
+
+
 1. debugedit.at:69: testing debugedit help ...
 ./debugedit.at:71: debugedit --help
-stderr:
+
+
 2. debugedit.at:77: testing debugedit usage ...
 ./debugedit.at:79: debugedit --usage
+
+stderr:
+3. debugedit.at:87: testing debugedit executable ...
+
+
+5. debugedit.at:113: testing debugedit .debug_str objects DWARF4 ...
+stdout:
 stdout:
 4. debugedit.at:97: testing debugedit executable (compressed) ...
+7. debugedit.at:188: testing debugedit .debug_str partial DWARF4 ...
+6. debugedit.at:150: testing debugedit .debug_str/line_str objects DWARF5 ...
+8. debugedit.at:219: testing debugedit .debug_str/line_str partial DWARF5 ...
+Usage: debugedit [-in?] [-b|--base-dir STRING] [-d|--dest-dir STRING]
+        [-l|--list-file STRING] [-i|--build-id] 
+        [-s|--build-id-seed STRING]
+        [-n|--no-recompute-build-id] [-?|--help] [-u|--usage]
+        [-V|--version] FILE
 Usage: debugedit [OPTION...] FILE
   -b, --base-dir=STRING           base build directory of objects
   -d, --dest-dir=STRING           directory to rewrite base-dir into
@@ -561,171 +618,178 @@
   -?, --help                      Show this help message
   -u, --usage                     Display brief usage message
   -V, --version                   Show debugedit version
-stdout:
-11. debugedit.at:327: testing debugedit .debug_info objects ...
-1. debugedit.at:69: 9. debugedit.at:251: testing debugedit .debug_str exe DWARF4 ...
- ok
-3. debugedit.at:87: testing debugedit executable ...
-8. debugedit.at:219: testing debugedit .debug_str/line_str partial DWARF5 ...
-Usage: debugedit [-in?] [-b|--base-dir STRING] [-d|--dest-dir STRING]
-        [-l|--list-file STRING] [-i|--build-id] 
-        [-s|--build-id-seed STRING]
-        [-n|--no-recompute-build-id] [-?|--help] [-u|--usage]
-        [-V|--version] FILE
-5. debugedit.at:113: testing debugedit .debug_str objects DWARF4 ...
-6. debugedit.at:150: testing debugedit .debug_str/line_str objects DWARF5 ...
 ./debugedit.at:80: debugedit
-7. debugedit.at:188: testing debugedit .debug_str partial DWARF4 ...
-stderr:
+11. debugedit.at:327: testing debugedit .debug_info objects ...
 10. debugedit.at:281: testing debugedit .debug_str/line_str exe DWARF5 ...
+1. debugedit.at:69:  ok
+12. debugedit.at:350: testing debugedit .debug_info objects (compressed) ...
+13. debugedit.at:379: testing debugedit .debug_info partial ...
+14. debugedit.at:398: testing debugedit .debug_info partial (compressed) ...
+9. debugedit.at:251: testing debugedit .debug_str exe DWARF4 ...
+stderr:
+19. debugedit.at:533: testing debugedit .debug_types exe DWARF4 ...
 debugedit: Need one FILE as input
 Usage: debugedit [-in?] [-b|--base-dir STRING] [-d|--dest-dir STRING]
         [-l|--list-file STRING] [-i|--build-id] 
         [-s|--build-id-seed STRING]
         [-n|--no-recompute-build-id] [-?|--help] [-u|--usage]
         [-V|--version] FILE
+15. debugedit.at:423: testing debugedit .debug_info exe ...
 ./debugedit.at:81: debugedit . ..
+17. debugedit.at:465: testing debugedit .debug_types objects ...
+16. debugedit.at:441: testing debugedit .debug_info exe (compressed) ...
+20. debugedit.at:563: testing debugedit .debug_types exe DWARF5 ...
 stderr:
+18. debugedit.at:503: testing debugedit .debug_types partial ...
 debugedit: Need one FILE as input
 Usage: debugedit [-in?] [-b|--base-dir STRING] [-d|--dest-dir STRING]
         [-l|--list-file STRING] [-i|--build-id] 
         [-s|--build-id-seed STRING]
         [-n|--no-recompute-build-id] [-?|--help] [-u|--usage]
         [-V|--version] FILE
-
+21. debugedit.at:599: testing debugedit .debug_line objects DWARF4 ...
 2. debugedit.at:77:  ok
-12. debugedit.at:350: testing debugedit .debug_info objects (compressed) ...
 
-13. debugedit.at:379: testing debugedit .debug_info partial ...
-./debugedit.at:103: ./foobarbaz.exe
-./debugedit.at:104: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+
+22. debugedit.at:626: testing debugedit .debug_line objects DWARF5 ...
+23. debugedit.at:656: testing debugedit .debug_line partial DWARF4 ...
 ./debugedit.at:91: ./foobarbaz.exe
+./debugedit.at:410: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
 ./debugedit.at:92: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:105: ./foobarbaz.exe
-./debugedit.at:337: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-./debugedit.at:338: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-4. debugedit.at:97:  ok
-./debugedit.at:93: ./foobarbaz.exe
-./debugedit.at:339: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
-3. debugedit.at:87:  ok
-./debugedit.at:340:
-($READELF --debug-dump=info foo.o; \
- $READELF --debug-dump=info subdir_bar/bar.o; \
- $READELF --debug-dump=info baz.o) \
+./debugedit.at:411:
+$READELF --debug-dump=info ./foobarbaz.part.o \
         | grep -E 'DW_AT_(name|comp_dir)' \
         | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
+./debugedit.at:93: ./foobarbaz.exe
+./debugedit.at:239: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+./debugedit.at:337: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+3. debugedit.at:87:  ok
+./debugedit.at:549: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+./debugedit.at:389: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
 ./debugedit.at:300: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+./debugedit.at:240:
+$READELF -zp.debug_str -zp.debug_line_str ./foobarbaz.part.o | cut -c13- \
+        | grep ^/foo/bar/baz | sort | uniq
+
+./debugedit.at:519: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+stderr:
+./debugedit.at:338: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+./debugedit.at:550:
+$READELF --debug-dump=info ./foobarbaz.exe \
+        | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
+        | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
+        | sort
+
+./debugedit.at:362: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:390:
+$READELF --debug-dump=info ./foobarbaz.part.o \
+        | grep -E 'DW_AT_(name|comp_dir)' \
+        | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
 ./debugedit.at:301:
 $READELF -zp.debug_str -zp.debug_line_str foobarbaz.exe | cut -c13- \
         | grep ^/foo/bar/baz | sort | uniq
 
+./debugedit.at:269: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+./debugedit.at:520:
+$READELF --debug-dump=info ./foobarbaz.part.o \
+        | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
+        | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
+        | sort
 
-./debugedit.at:239: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
-./debugedit.at:171: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+14. debugedit.at:398: ./debugedit.at:433: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
 stderr:
+ ok
+./debugedit.at:485: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:339: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
 ./debugedit.at:207: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
-./debugedit.at:172: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:269: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:173: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+./debugedit.at:363: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
 stderr:
-14. debugedit.at:398: testing debugedit .debug_info partial (compressed) ...
-15. debugedit.at:423: testing debugedit .debug_info exe ...
-./debugedit.at:240:
-$READELF -zp.debug_str -zp.debug_line_str ./foobarbaz.part.o | cut -c13- \
-        | grep ^/foo/bar/baz | sort | uniq
-
-./debugedit.at:208:
-$READELF -zp.debug_str ./foobarbaz.part.o | cut -c13- \
-        | grep ^/foo/bar/baz | sort
-
-11. debugedit.at:327:  ok
-./debugedit.at:174:
-($READELF -zp.debug_str -zp.debug_line_str foo.o; \
- $READELF -zp.debug_str -zp.debug_line_str subdir_bar/bar.o; \
- $READELF -zp.debug_str -zp.debug_line_str baz.o) \
-        | cut -c13- \
-        | grep ^/foo/bar/baz | sort | uniq
-
-./debugedit.at:133: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-./debugedit.at:270:
+./debugedit.at:453: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+stderr:
+8. debugedit.at:219: ./debugedit.at:270:
 $READELF -zp.debug_str foobarbaz.exe | cut -c13- \
         | grep ^/foo/bar/baz | sort
 
-10. debugedit.at:281:  ok
 stderr:
-./debugedit.at:362: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-./debugedit.at:134: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-7. debugedit.at:188:  ok
-./debugedit.at:363: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:364: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
-8. debugedit.at:219:  ok
-./debugedit.at:135: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
-9. debugedit.at:251:  ok
-./debugedit.at:389: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
-
-./debugedit.at:136:
-($READELF -zp.debug_str foo.o; \
- $READELF -zp.debug_str subdir_bar/bar.o; \
- $READELF -zp.debug_str baz.o) \
-	| cut -c13- \
-        | grep ^/foo/bar/baz | sort
+ ok
+./debugedit.at:434:
+$READELF --debug-dump=info ./foobarbaz.exe | grep -E 'DW_AT_(name|comp_dir)' \
+        | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
-./debugedit.at:365:
+./debugedit.at:171: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:340:
 ($READELF --debug-dump=info foo.o; \
  $READELF --debug-dump=info subdir_bar/bar.o; \
  $READELF --debug-dump=info baz.o) \
         | grep -E 'DW_AT_(name|comp_dir)' \
         | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
-stderr:
-
+./debugedit.at:133: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:486: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+./debugedit.at:103: ./foobarbaz.exe
 
-./debugedit.at:390:
-$READELF --debug-dump=info ./foobarbaz.part.o \
-        | grep -E 'DW_AT_(name|comp_dir)' \
-        | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
+./debugedit.at:208:
+$READELF -zp.debug_str ./foobarbaz.part.o | cut -c13- \
+        | grep ^/foo/bar/baz | sort
 
-6. debugedit.at:150:  ok
-5. debugedit.at:113:  ok
 stderr:
-16. debugedit.at:441: testing debugedit .debug_info exe (compressed) ...
-
-18. debugedit.at:503: testing debugedit .debug_types partial ...
-17. debugedit.at:465: testing debugedit .debug_types objects ...
-stderr:
-13. debugedit.at:379: 
+19. debugedit.at:533: ./debugedit.at:364: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+13. debugedit.at:379:  ok
  ok
-12. debugedit.at:350:  ok
-19. debugedit.at:533: testing debugedit .debug_types exe DWARF4 ...
-
-
-20. debugedit.at:563: testing debugedit .debug_types exe DWARF5 ...
-
-21. debugedit.at:599: testing debugedit .debug_line objects DWARF4 ...
-22. debugedit.at:626: testing debugedit .debug_line objects DWARF5 ...
-
-23. debugedit.at:656: testing debugedit .debug_line partial DWARF4 ...
-24. debugedit.at:678: testing debugedit .debug_line partial DWARF5 ...
-./debugedit.at:433: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:434:
+./debugedit.at:172: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+./debugedit.at:454:
 $READELF --debug-dump=info ./foobarbaz.exe | grep -E 'DW_AT_(name|comp_dir)' \
         | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
-./debugedit.at:485: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-./debugedit.at:410: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+./debugedit.at:134: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
 stderr:
-./debugedit.at:486: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:411:
-$READELF --debug-dump=info ./foobarbaz.part.o \
+10. debugedit.at:281: ./debugedit.at:487: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+
+ ok
+./debugedit.at:104: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+18. debugedit.at:503: 9. debugedit.at:251:  ok
+ ok
+./debugedit.at:173: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+./debugedit.at:365:
+($READELF --debug-dump=info foo.o; \
+ $READELF --debug-dump=info subdir_bar/bar.o; \
+ $READELF --debug-dump=info baz.o) \
         | grep -E 'DW_AT_(name|comp_dir)' \
         | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
 
+./debugedit.at:580: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+./debugedit.at:135: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+  1	subdir_foo
+  2	subdir_headers
+  3	/usr/include
+  1	1	0	0	foo.c
+  2	2	0	0	foobar.h
+  3	3	0	0	stdc-predef.h
+  1	../subdir_headers
+  2	/usr/include
+  1	0	0	0	bar.c
+  2	1	0	0	foobar.h
+  3	2	0	0	stdc-predef.h
+  1	/foo/bar/baz
+  2	/foo/bar/baz/subdir_headers
+  3	/usr/include
+  1	1	0	0	baz.c
+  2	2	0	0	foobar.h
+  3	3	0	0	stdc-predef.h
 15. debugedit.at:423:  ok
-./debugedit.at:487: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+24. debugedit.at:678: testing debugedit .debug_line partial DWARF5 ...
+./debugedit.at:665: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
 stderr:
-14. debugedit.at:398:  ok
+
+./debugedit.at:174:
+($READELF -zp.debug_str -zp.debug_line_str foo.o; \
+ $READELF -zp.debug_str -zp.debug_line_str subdir_bar/bar.o; \
+ $READELF -zp.debug_str -zp.debug_line_str baz.o) \
+        | cut -c13- \
+        | grep ^/foo/bar/baz | sort | uniq
+
 ./debugedit.at:488:
 for i in ./foo.o ./subdir_bar/bar.o ./baz.o;do \
   $READELF --debug-dump=info $i \
@@ -734,47 +798,31 @@
           | sort;
 done
 
-
-./debugedit.at:580: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:581:
+7. debugedit.at:188: ./debugedit.at:581:
 $READELF --debug-dump=info ./foobarbaz.exe \
         | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
         | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
         | sort
 
-25. debugedit.at:702: testing debugedit .debug_line exe DWARF4 ...
-./debugedit.at:453: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:519: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
-./debugedit.at:454:
-$READELF --debug-dump=info ./foobarbaz.exe | grep -E 'DW_AT_(name|comp_dir)' \
-        | rev | cut -d: -f1 | rev | cut -c2- | grep ^/foo/bar/baz | sort -u
-
-
-stderr:
+ ok
+./debugedit.at:105: ./foobarbaz.exe
 stderr:
-./debugedit.at:520:
-$READELF --debug-dump=info ./foobarbaz.part.o \
-        | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
-        | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
-        | sort
+./debugedit.at:136:
+($READELF -zp.debug_str foo.o; \
+ $READELF -zp.debug_str subdir_bar/bar.o; \
+ $READELF -zp.debug_str baz.o) \
+	| cut -c13- \
+        | grep ^/foo/bar/baz | sort
 
-stderr:
-stderr:
-20. debugedit.at:563:  ok
-./debugedit.at:549: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-16. debugedit.at:441:  ok
-17. debugedit.at:465:  ok
-./debugedit.at:550:
-$READELF --debug-dump=info ./foobarbaz.exe \
-        | awk '/Abbrev Number:.*DW_TAG_type_unit/{p=1}{if(p)print}/^$/{p=0}' \
-        | sed -n 's/^.*> *DW_AT_name *:.* \(stringp[^ ]*\|st.\)$/\1/p' \
-        | sort
 
-18. debugedit.at:503:  ok
-26. debugedit.at:724: testing debugedit .debug_line exe DWARF5 ...
-stderr:
-19. debugedit.at:533:  ok
+4. debugedit.at:97:  ok
+25. debugedit.at:702: testing debugedit .debug_line exe DWARF4 ...
+16. debugedit.at:441:  ok
 
+./debugedit.at:666:
+$READELF --debug-dump=line ./foobarbaz.part.o \
+        | grep -E -A5 "The (Directory|File Name) Table" \
+	| grep "^  [1234]"
 
   1	subdir_foo
   2	subdir_headers
@@ -793,39 +841,44 @@
   1	1	0	0	baz.c
   2	2	0	0	foobar.h
   3	3	0	0	stdc-predef.h
-./debugedit.at:665: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+stderr:
 
-  1	subdir_foo
-  2	subdir_headers
-  3	/usr/include
-  1	1	0	0	foo.c
-  2	2	0	0	foobar.h
-  3	3	0	0	stdc-predef.h
-  1	../subdir_headers
-  2	/usr/include
-  1	0	0	0	bar.c
-  2	1	0	0	foobar.h
-  3	2	0	0	stdc-predef.h
-  1	/foo/bar/baz
-  2	/foo/bar/baz/subdir_headers
-  3	/usr/include
-  1	1	0	0	baz.c
-  2	2	0	0	foobar.h
-  3	3	0	0	stdc-predef.h
 
+stderr:
 ./debugedit.at:610: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-27. debugedit.at:748: testing debugedit .debug_macro objects ...
-./debugedit.at:611: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:666:
-$READELF --debug-dump=line ./foobarbaz.part.o \
-        | grep -E -A5 "The (Directory|File Name) Table" \
-	| grep "^  [1234]"
 
+26. debugedit.at:724: testing debugedit .debug_line exe DWARF5 ...
+11. debugedit.at:327:  ok
 
+stderr:
+stderr:
+20. debugedit.at:563:  ok
+12. debugedit.at:350: 
+ ok
+stderr:
+./debugedit.at:611: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+27. debugedit.at:748: testing debugedit .debug_macro objects ...
 28. debugedit.at:775: testing debugedit .debug_macro partial ...
-30. debugedit.at:817: testing debugedit .debug_macro exe (compressed) ...
+23. debugedit.at:656: 6. debugedit.at:150:  ok
 29. debugedit.at:798: testing debugedit .debug_macro exe ...
-./debugedit.at:612: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+ ok
+31. debugedit.at:841: testing debugedit --list-file DWARF4 ...
+
+30. debugedit.at:817: testing debugedit .debug_macro exe (compressed) ...
+
+17. debugedit.at:465:  ok
+32. debugedit.at:853: testing debugedit --list-file DWARF5 ...
+5. debugedit.at:113: ./debugedit.at:612: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+ ok
+33. debugedit.at:865: testing debugedit --list-file compressed DWARF4 ...
+34. debugedit.at:876: testing debugedit --list-file compressed DWARF5 ...
+35. debugedit.at:888: testing debugedit build-id recompute ...
+./debugedit.at:613:
+($READELF --debug-dump=line foo.o; \
+ $READELF --debug-dump=line subdir_bar/bar.o; \
+ $READELF --debug-dump=line baz.o) \
+        | grep -E -A5 "The (Directory|File Name) Table" | grep "^  [1234]"
+
  /foo/bar/baz
  subdir_foo
  subdir_headers
@@ -849,8 +902,54 @@
  baz.c
  foobar.h
  stdc-predef.h
-./debugedit.at:689: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+./debugedit.at:639: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:640: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+stderr:
+./debugedit.at:641: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+21. debugedit.at:599:  ok
+./debugedit.at:642:
+($READELF --debug-dump=line foo.o; \
+ $READELF --debug-dump=line subdir_bar/bar.o; \
+ $READELF --debug-dump=line baz.o) \
+	| grep -E -A5 "The (Directory|File Name) Table" \
+	| grep "^  [01234]" | cut -f3 -d:
+
+stderr:
+22. debugedit.at:626:  ok
+./debugedit.at:858: debugedit -l sources.list main
+./debugedit.at:869: debugedit -l sources.list main
+./debugedit.at:859: grep -q main.c sources.list
+./debugedit.at:870: grep -q main.c sources.list
+./debugedit.at:845: debugedit -l sources.list main
+33. debugedit.at:865: ./debugedit.at:846: grep -q main.c sources.list
+ ok
+./debugedit.at:881: debugedit -l sources.list main
+/build/reproducible-path/debugedit-5.1/tests/testsuite.dir/31/main.c�31. debugedit.at:841:  ok
+./debugedit.at:882: grep -q main.c sources.list
+./debugedit.at:894: $READELF -n main | grep Build.ID: | awk '{print $3}'
+34. debugedit.at:876:  ok
+stderr:
+stdout:
+35f21a21588d202e33d4a5e00adb42fade388598
+./debugedit.at:896: expr "$bid" : '[0-9a-f]*'
+stdout:
+40
+./debugedit.at:899: debugedit -i -s deadbeef main
+stdout:
+82277f0be4d4d23fd1f3e1657a94e565de388598
+./debugedit.at:901: expr "$bid2a" : '[0-9a-f]*'
+stdout:
+40
+./debugedit.at:902: test "$bid" != "$bid2a"
+./debugedit.at:905: $READELF -n main | grep Build.ID: | awk '{print $3}'
 stderr:
+stdout:
+82277f0be4d4d23fd1f3e1657a94e565de388598
+./debugedit.at:907: expr "$bid2b" : '[0-9a-f]*'
+stdout:
+40
+./debugedit.at:908: test "$bid2a" = "$bid2b"
+./debugedit.at:911: debugedit -i -s deadbeef main
  /foo/bar/baz
  subdir_foo
  subdir_headers
@@ -874,90 +973,20 @@
  baz.c
  foobar.h
  stdc-predef.h
-./debugedit.at:639: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:689: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+./debugedit.at:786: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
 ./debugedit.at:690:
 $READELF --debug-dump=line ./foobarbaz.part.o \
 	| grep -E -A5 "The (Directory|File Name) Table" \
 	| grep "^  [01234]" | cut -f3 -d:
 
-31. debugedit.at:841: testing debugedit --list-file DWARF4 ...
-23. debugedit.at:656:  ok
-./debugedit.at:640: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:613:
-($READELF --debug-dump=line foo.o; \
- $READELF --debug-dump=line subdir_bar/bar.o; \
- $READELF --debug-dump=line baz.o) \
-        | grep -E -A5 "The (Directory|File Name) Table" | grep "^  [1234]"
+./debugedit.at:787:
+$READELF --debug-dump=macro ./foobarbaz.part.o \
+        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
 
-./debugedit.at:641: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
 stderr:
 stderr:
 24. debugedit.at:678:  ok
-./debugedit.at:642:
-($READELF --debug-dump=line foo.o; \
- $READELF --debug-dump=line subdir_bar/bar.o; \
- $READELF --debug-dump=line baz.o) \
-	| grep -E -A5 "The (Directory|File Name) Table" \
-	| grep "^  [01234]" | cut -f3 -d:
-
-21. debugedit.at:599:  ok
-
-
-stderr:
-
-32. debugedit.at:853: testing debugedit --list-file DWARF5 ...
-22. debugedit.at:626:  ok
-  1	subdir_foo
-  2	subdir_headers
-  3	/usr/include
-  1	1	0	0	foo.c
-  2	2	0	0	foobar.h
-  3	3	0	0	stdc-predef.h
-  1	../subdir_headers
-  2	/usr/include
-  1	0	0	0	bar.c
-  2	1	0	0	foobar.h
-  3	2	0	0	stdc-predef.h
-  1	/foo/bar/baz
-  2	/foo/bar/baz/subdir_headers
-  3	/usr/include
-  1	1	0	0	baz.c
-  2	2	0	0	foobar.h
-  3	3	0	0	stdc-predef.h
-./debugedit.at:711: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-33. debugedit.at:865: testing debugedit --list-file compressed DWARF4 ...
-34. debugedit.at:876: testing debugedit --list-file compressed DWARF5 ...
-./debugedit.at:845: debugedit -l sources.list main
-./debugedit.at:846: grep -q main.c sources.list
-./debugedit.at:712:
-$READELF --debug-dump=line ./foobarbaz.exe \
-        | grep -E -A5 "The (Directory|File Name) Table" \
-	| grep "^  [1234]"
-
-/build/reproducible-path/debugedit-5.1/tests/testsuite.dir/31/main.c�31. debugedit.at:841: 
- ok
-stderr:
-25. debugedit.at:702:  ok
-35. debugedit.at:888: testing debugedit build-id recompute ...
-./debugedit.at:869: debugedit -l sources.list main
-./debugedit.at:870: grep -q main.c sources.list
-./debugedit.at:881: debugedit -l sources.list main
-./debugedit.at:858: debugedit -l sources.list main
-./debugedit.at:882: grep -q main.c sources.list
-./debugedit.at:859: grep -q main.c sources.list
-33. debugedit.at:865:  ok
-32. debugedit.at:853:  ok
-34. debugedit.at:876:  ok
-./debugedit.at:759: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
-./debugedit.at:760: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
-./debugedit.at:761: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
-./debugedit.at:894: $READELF -n main | grep Build.ID: | awk '{print $3}'
-./debugedit.at:762:
-($READELF --debug-dump=macro foo.o; \
- $READELF --debug-dump=macro subdir_bar/bar.o; \
- $READELF --debug-dump=macro baz.o) \
-        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
-
  /foo/bar/baz
  subdir_foo
  subdir_headers
@@ -982,58 +1011,47 @@
  foobar.h
  stdc-predef.h
 ./debugedit.at:735: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:830: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-./debugedit.at:809: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
-stderr:
-stdout:
-./debugedit.at:831:
-$READELF --debug-dump=macro ./foobarbaz.exe \
-        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
-
-35f21a21588d202e33d4a5e00adb42fade388598
-stderr:
-./debugedit.at:810:
-$READELF --debug-dump=macro ./foobarbaz.exe \
-        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
-
+28. debugedit.at:775:  ok
 ./debugedit.at:736:
 $READELF --debug-dump=line ./foobarbaz.exe \
 	| grep -E -A5 "The (Directory|File Name) Table" \
 	| grep "^  [01234]" | cut -f3 -d:
 
-./debugedit.at:896: expr "$bid" : '[0-9a-f]*'
-stderr:
-27. debugedit.at:748:  ok
-stdout:
-40
-./debugedit.at:899: debugedit -i -s deadbeef main
-stderr:
-30. debugedit.at:817:  ok
-stdout:
 stderr:
-82277f0be4d4d23fd1f3e1657a94e565de388598
-./debugedit.at:901: expr "$bid2a" : '[0-9a-f]*'
-29. debugedit.at:798:  ok
-./debugedit.at:786: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.part.o
+./debugedit.at:809: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
 26. debugedit.at:724:  ok
-stdout:
-40
-./debugedit.at:902: test "$bid" != "$bid2a"
-./debugedit.at:905: $READELF -n main | grep Build.ID: | awk '{print $3}'
-./debugedit.at:787:
-$READELF --debug-dump=macro ./foobarbaz.part.o \
+  1	subdir_foo
+  2	subdir_headers
+  3	/usr/include
+  1	1	0	0	foo.c
+  2	2	0	0	foobar.h
+  3	3	0	0	stdc-predef.h
+  1	../subdir_headers
+  2	/usr/include
+  1	0	0	0	bar.c
+  2	1	0	0	foobar.h
+  3	2	0	0	stdc-predef.h
+  1	/foo/bar/baz
+  2	/foo/bar/baz/subdir_headers
+  3	/usr/include
+  1	1	0	0	baz.c
+  2	2	0	0	foobar.h
+  3	3	0	0	stdc-predef.h
+./debugedit.at:810:
+$READELF --debug-dump=macro ./foobarbaz.exe \
         | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
 
+./debugedit.at:711: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
 stderr:
-stdout:
-82277f0be4d4d23fd1f3e1657a94e565de388598
+./debugedit.at:712:
+$READELF --debug-dump=line ./foobarbaz.exe \
+        | grep -E -A5 "The (Directory|File Name) Table" \
+	| grep "^  [1234]"
+
+29. debugedit.at:798:  ok
 stderr:
-./debugedit.at:907: expr "$bid2b" : '[0-9a-f]*'
-stdout:
-40
-./debugedit.at:908: test "$bid2a" = "$bid2b"
-28. debugedit.at:775:  ok
-./debugedit.at:911: debugedit -i -s deadbeef main
+25. debugedit.at:702:  ok
+32. debugedit.at:853:  ok
 stdout:
 82277f0be4d4d23fd1f3e1657a94e565de388598
 ./debugedit.at:913: expr "$bid2c" : '[0-9a-f]*'
@@ -1048,6 +1066,24 @@
 40
 ./debugedit.at:920: test "$bid3" != "$bid2a"
 35. debugedit.at:888:  ok
+./debugedit.at:759: debugedit -b $(pwd) -d /foo/bar/baz ./foo.o
+./debugedit.at:760: debugedit -b $(pwd) -d /foo/bar/baz ./subdir_bar/bar.o
+./debugedit.at:761: debugedit -b $(pwd) -d /foo/bar/baz ./baz.o
+./debugedit.at:762:
+($READELF --debug-dump=macro foo.o; \
+ $READELF --debug-dump=macro subdir_bar/bar.o; \
+ $READELF --debug-dump=macro baz.o) \
+        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
+
+stderr:
+27. debugedit.at:748:  ok
+./debugedit.at:830: debugedit -b $(pwd) -d /foo/bar/baz ./foobarbaz.exe
+./debugedit.at:831:
+$READELF --debug-dump=macro ./foobarbaz.exe \
+        | grep NUMBER | rev | cut -d: -f1 | rev | cut -c2-
+
+stderr:
+30. debugedit.at:817:  ok
 
 ## ------------- ##
 ## Test results. ##
@@ -1063,7 +1099,7 @@
    create-stamp debian/debhelper-build-stamp
    dh_prep
    dh_auto_install --destdir=debian/debugedit/
-	make -j11 install DESTDIR=/build/reproducible-path/debugedit-5.1/debian/debugedit AM_UPDATE_INFO_DIR=no
+	make -j21 install DESTDIR=/build/reproducible-path/debugedit-5.1/debian/debugedit AM_UPDATE_INFO_DIR=no
 make[1]: Entering directory '/build/reproducible-path/debugedit-5.1'
 Making install in tests
 make[2]: Entering directory '/build/reproducible-path/debugedit-5.1/tests'
@@ -1076,8 +1112,8 @@
 make[3]: Entering directory '/build/reproducible-path/debugedit-5.1'
  /usr/bin/mkdir -p '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/bin'
  /usr/bin/mkdir -p '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/bin'
- /usr/bin/install -c find-debuginfo '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/bin'
  /usr/bin/mkdir -p '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/share/man/man1'
+ /usr/bin/install -c find-debuginfo '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/bin'
   /usr/bin/install -c debugedit sepdebugcrcfix '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/bin'
  /usr/bin/install -c -m 644 debugedit.1 sepdebugcrcfix.1 find-debuginfo.1 '/build/reproducible-path/debugedit-5.1/debian/debugedit/usr/share/man/man1'
 make[3]: Leaving directory '/build/reproducible-path/debugedit-5.1'
@@ -1109,12 +1145,14 @@
 dpkg-buildpackage: info: binary-only upload (no source included)
 dpkg-genchanges: info: not including original source code in upload
 I: copying local configuration
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/B01_cleanup starting
+I: user script /srv/workspace/pbuilder/59548/tmp/hooks/B01_cleanup finished
 I: unmounting dev/ptmx filesystem
 I: unmounting dev/pts filesystem
 I: unmounting dev/shm filesystem
 I: unmounting proc filesystem
 I: unmounting sys filesystem
 I: cleaning the build env 
-I: removing directory /srv/workspace/pbuilder/36954 and its subdirectories
-I: Current time: Fri Feb 14 20:41:24 -12 2025
-I: pbuilder-time-stamp: 1739608884
+I: removing directory /srv/workspace/pbuilder/59548 and its subdirectories
+I: Current time: Sat Mar 21 05:04:57 +14 2026
+I: pbuilder-time-stamp: 1774019097