build: Do not ship objdump.tags-<arch> files in the repo

This was causing diff problems as the file was changing depending on the
build system. Now it should be stable as it's always generated at check
time.

scripts/Makefile.am

@@ -147,6 +147,10 @@ test_cases = \
 	t/800_Dpkg_IPC.t \
 	t/900_update_alternatives.t
 
+check_DATA = \
+	$(test_tmpdir)/200_Dpkg_Shlibs/objdump.tags-amd64 \
+	$(test_tmpdir)/200_Dpkg_Shlibs/objdump.tags-i386
+
 test_data = \
 	t/200_Dpkg_Shlibs/symbols.fake-1 \
 	t/200_Dpkg_Shlibs/symbols.fake-2 \
@@ -166,8 +170,6 @@ test_data = \
 	t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
 	t/200_Dpkg_Shlibs/objdump.dbd-pg \
 	t/200_Dpkg_Shlibs/objdump.ls \
-	t/200_Dpkg_Shlibs/objdump.tags-amd64 \
-	t/200_Dpkg_Shlibs/objdump.tags-i386 \
 	t/600_Dpkg_Changelog/countme \
 	t/600_Dpkg_Changelog/fields \
 	t/600_Dpkg_Changelog/misplaced-tz \
@@ -189,12 +191,11 @@ check: $(test_data) $(test_cases)
 	          $(addprefix $(srcdir)/,$(test_cases))
 
 objdump_lib_name = lib`basename $@`.so
-$(srcdir)/t/200_Dpkg_Shlibs/objdump.tags-amd64 $(srcdir)/t/200_Dpkg_Shlibs/objdump.tags-i386: $(srcdir)/t/200_Dpkg_Shlibs/symboltags.c
+$(test_tmpdir)/200_Dpkg_Shlibs/objdump.tags-amd64 $(test_tmpdir)/200_Dpkg_Shlibs/objdump.tags-i386: $(srcdir)/t/200_Dpkg_Shlibs/symboltags.c
+	$(mkdir_p) $(test_tmpdir)/200_Dpkg_Shlibs
 	$(CC) $(CFLAGS) -shared -fPIC -Wl,-soname -Wl,libsymboltags.so.1 $< \
 	  $(if $(findstring amd64,$@),-DAMD64,) -o $(objdump_lib_name)
 	objdump -w -f -p -T -R $(objdump_lib_name) | \
 	  sed "s/$(objdump_lib_name)/libsymboltags.so.1/g" > $@
 	rm -f $(objdump_lib_name)
 
-update-objdumps .PHONY: $(srcdir)/t/200_Dpkg_Shlibs/objdump.tags-amd64
-update-objdumps .PHONY: $(srcdir)/t/200_Dpkg_Shlibs/objdump.tags-i386

scripts/t/200_Dpkg_Shlibs.t

@@ -29,6 +29,7 @@ my @save_paths = @Dpkg::Shlibs::librarypaths;
 
 my $srcdir = $ENV{srcdir} || '.';
 my $datadir = $srcdir . '/t/200_Dpkg_Shlibs';
+my $tmpdir = 't.tmp/200_Dpkg_Shlibs';
 
 # We want relative paths inside the ld.so.conf fragments to work, and $srcdir
 # is usually a relative path, so let's temporarily switch directory.
@@ -288,14 +289,16 @@ ok (defined $sym_file->{objects}{'libsymboltags.so.1'}{syms}{'symbol21_amd64@Bas
 
 # Preload objdumps
 my $tags_obj_i386 = Dpkg::Shlibs::Objdump::Object->new();
-open $objdump, '<', "$datadir/objdump.tags-i386" or die "$datadir/objdump.tags-i386: $!";
+open $objdump, '<', "$tmpdir/objdump.tags-i386"
+    or die "$tmpdir/objdump.tags-i386: $!";
 $tags_obj_i386->_parse($objdump);
 close $objdump;
 $sym_file->merge_symbols($tags_obj_i386, '100.MISSING');
 is_deeply($sym_file, $sym_file_dup, "is objdump.tags-i386 and symbols.tags.in in sync");
 
 my $tags_obj_amd64 = Dpkg::Shlibs::Objdump::Object->new();
-open $objdump, '<', "$datadir/objdump.tags-amd64" or die "$datadir/objdump.tags-amd64: $!";
+open $objdump, '<', "$tmpdir/objdump.tags-amd64"
+    or die "$tmpdir/objdump.tags-amd64: $!";
 $tags_obj_amd64->_parse($objdump);
 close $objdump;
 

scripts/t/200_Dpkg_Shlibs/objdump.tags-amd64

@@ -1,72 +0,0 @@
-
-libsymboltags.so.1:     file format elf64-x86-64
-architecture: i386:x86-64, flags 0x00000150:
-HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x0000000000000560
-
-Program Header:
-    LOAD off    0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**21
-         filesz 0x0000000000000774 memsz 0x0000000000000774 flags r-x
-    LOAD off    0x0000000000000778 vaddr 0x0000000000200778 paddr 0x0000000000200778 align 2**21
-         filesz 0x0000000000000208 memsz 0x0000000000000218 flags rw-
- DYNAMIC off    0x00000000000007a0 vaddr 0x00000000002007a0 paddr 0x00000000002007a0 align 2**3
-         filesz 0x00000000000001a0 memsz 0x00000000000001a0 flags rw-
-    NOTE off    0x0000000000000190 vaddr 0x0000000000000190 paddr 0x0000000000000190 align 2**2
-         filesz 0x0000000000000024 memsz 0x0000000000000024 flags r--
-EH_FRAME off    0x00000000000006c8 vaddr 0x00000000000006c8 paddr 0x00000000000006c8 align 2**2
-         filesz 0x000000000000002c memsz 0x000000000000002c flags r--
-   STACK off    0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**3
-         filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw-
-
-Dynamic Section:
-  NEEDED               libc.so.6
-  SONAME               libsymboltags.so.1
-  INIT                 0x0000000000000520
-  FINI                 0x00000000000006b8
-  HASH                 0x00000000000001b8
-  GNU_HASH             0x0000000000000208
-  STRTAB               0x00000000000003a0
-  SYMTAB               0x0000000000000250
-  STRSZ                0x00000000000000c6
-  SYMENT               0x0000000000000018
-  PLTGOT               0x0000000000200958
-  PLTRELSZ             0x0000000000000018
-  PLTREL               0x0000000000000007
-  JMPREL               0x0000000000000508
-  RELA                 0x00000000000004a8
-  RELASZ               0x0000000000000060
-  RELAENT              0x0000000000000018
-  VERNEED              0x0000000000000488
-  VERNEEDNUM           0x0000000000000001
-  VERSYM               0x0000000000000466
-  RELACOUNT            0x0000000000000001
-
-Version References:
-  required from libc.so.6:
-    0x09691a75 0x00 02 GLIBC_2.2.5
-
-DYNAMIC SYMBOL TABLE:
-0000000000000520 l    d  .init	0000000000000000              .init
-0000000000000000  w   D  *UND*	0000000000000000              __gmon_start__
-0000000000000000  w   D  *UND*	0000000000000000              _Jv_RegisterClasses
-0000000000000000  w   DF *UND*	0000000000000000  GLIBC_2.2.5 __cxa_finalize
-0000000000000650 g    DF .text	0000000000000002  Base        symbol21_amd64
-0000000000200990 g    D  *ABS*	0000000000000000  Base        _end
-0000000000200980 g    D  *ABS*	0000000000000000  Base        _edata
-0000000000200980 g    D  *ABS*	0000000000000000  Base        __bss_start
-0000000000000520 g    DF .init	0000000000000000  Base        _init
-00000000000006b8 g    DF .fini	0000000000000000  Base        _fini
-0000000000000640 g    DF .text	0000000000000002  Base        symbol11_optional
-0000000000000660 g    DF .text	0000000000000002  Base        symbol31_randomtag
-0000000000000670 g    DF .text	0000000000000002  Base        symbol51_untagged
-
-
-DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
-0000000000200978 R_X86_64_RELATIVE  *ABS*+0x0000000000200978
-0000000000200940 R_X86_64_GLOB_DAT  __gmon_start__
-0000000000200948 R_X86_64_GLOB_DAT  _Jv_RegisterClasses
-0000000000200950 R_X86_64_GLOB_DAT  __cxa_finalize
-0000000000200970 R_X86_64_JUMP_SLOT  __cxa_finalize
-
-

scripts/t/200_Dpkg_Shlibs/objdump.tags-i386

@@ -1,73 +0,0 @@
-
-libsymboltags.so.1:     file format elf64-x86-64
-architecture: i386:x86-64, flags 0x00000150:
-HAS_SYMS, DYNAMIC, D_PAGED
-start address 0x0000000000000590
-
-Program Header:
-    LOAD off    0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**21
-         filesz 0x00000000000007d4 memsz 0x00000000000007d4 flags r-x
-    LOAD off    0x00000000000007d8 vaddr 0x00000000002007d8 paddr 0x00000000002007d8 align 2**21
-         filesz 0x0000000000000208 memsz 0x0000000000000218 flags rw-
- DYNAMIC off    0x0000000000000800 vaddr 0x0000000000200800 paddr 0x0000000000200800 align 2**3
-         filesz 0x00000000000001a0 memsz 0x00000000000001a0 flags rw-
-    NOTE off    0x0000000000000190 vaddr 0x0000000000000190 paddr 0x0000000000000190 align 2**2
-         filesz 0x0000000000000024 memsz 0x0000000000000024 flags r--
-EH_FRAME off    0x0000000000000708 vaddr 0x0000000000000708 paddr 0x0000000000000708 align 2**2
-         filesz 0x0000000000000034 memsz 0x0000000000000034 flags r--
-   STACK off    0x0000000000000000 vaddr 0x0000000000000000 paddr 0x0000000000000000 align 2**3
-         filesz 0x0000000000000000 memsz 0x0000000000000000 flags rw-
-
-Dynamic Section:
-  NEEDED               libc.so.6
-  SONAME               libsymboltags.so.1
-  INIT                 0x0000000000000558
-  FINI                 0x00000000000006f8
-  HASH                 0x00000000000001b8
-  GNU_HASH             0x0000000000000208
-  STRTAB               0x00000000000003c0
-  SYMTAB               0x0000000000000258
-  STRSZ                0x00000000000000e0
-  SYMENT               0x0000000000000018
-  PLTGOT               0x00000000002009b8
-  PLTRELSZ             0x0000000000000018
-  PLTREL               0x0000000000000007
-  JMPREL               0x0000000000000540
-  RELA                 0x00000000000004e0
-  RELASZ               0x0000000000000060
-  RELAENT              0x0000000000000018
-  VERNEED              0x00000000000004c0
-  VERNEEDNUM           0x0000000000000001
-  VERSYM               0x00000000000004a0
-  RELACOUNT            0x0000000000000001
-
-Version References:
-  required from libc.so.6:
-    0x09691a75 0x00 02 GLIBC_2.2.5
-
-DYNAMIC SYMBOL TABLE:
-0000000000000558 l    d  .init	0000000000000000              .init
-0000000000000000  w   D  *UND*	0000000000000000              __gmon_start__
-0000000000000000  w   D  *UND*	0000000000000000              _Jv_RegisterClasses
-0000000000000000  w   DF *UND*	0000000000000000  GLIBC_2.2.5 __cxa_finalize
-00000000000006a0 g    DF .text	0000000000000002  Base        symbol41_i386_and_optional
-00000000002009f0 g    D  *ABS*	0000000000000000  Base        _end
-00000000002009e0 g    D  *ABS*	0000000000000000  Base        _edata
-0000000000000680 g    DF .text	0000000000000002  Base        symbol22_i386
-00000000002009e0 g    D  *ABS*	0000000000000000  Base        __bss_start
-0000000000000558 g    DF .init	0000000000000000  Base        _init
-00000000000006f8 g    DF .fini	0000000000000000  Base        _fini
-0000000000000670 g    DF .text	0000000000000002  Base        symbol11_optional
-0000000000000690 g    DF .text	0000000000000002  Base        symbol31_randomtag
-00000000000006b0 g    DF .text	0000000000000002  Base        symbol51_untagged
-
-
-DYNAMIC RELOCATION RECORDS
-OFFSET           TYPE              VALUE 
-00000000002009d8 R_X86_64_RELATIVE  *ABS*+0x00000000002009d8
-00000000002009a0 R_X86_64_GLOB_DAT  __gmon_start__
-00000000002009a8 R_X86_64_GLOB_DAT  _Jv_RegisterClasses
-00000000002009b0 R_X86_64_GLOB_DAT  __cxa_finalize
-00000000002009d0 R_X86_64_JUMP_SLOT  __cxa_finalize
-
-