The following commit has been merged in the master branch:
commit 8aadb22011b88f9740f18a89ee4a4c13d7e293c6
Author: Guillem Jover <guil...@debian.org>
Date: Mon Dec 12 09:30:39 2011 +0100
scripts: Move single space objdump test case into a new data file
This will allow to regenerate the objdump.ls file.
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 8e973f2..f4d6ba9 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -213,6 +213,7 @@ test_data = \
t/200_Dpkg_Shlibs/ld.so.conf.d/normal.conf \
t/200_Dpkg_Shlibs/ld.so.conf.d/inf_recurse.conf \
t/200_Dpkg_Shlibs/ld.so.conf.d/recursive.conf \
+ t/200_Dpkg_Shlibs/objdump.space \
t/200_Dpkg_Shlibs/objdump.glib-ia64 \
t/200_Dpkg_Shlibs/objdump.libc6-2.3 \
t/200_Dpkg_Shlibs/objdump.libc6-2.6 \
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t
index cb82723..8471a43 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/200_Dpkg_Shlibs.t
@@ -69,6 +69,12 @@ my $sym = $obj->get_symbol('optarg@GLIBC_2.0');
ok($sym, 'optarg@GLIBC_2.0 exists');
ok(!$sym->{'defined'}, 'R_*_COPY relocations are taken into account');
+open $objdump, '<', "$datadir/objdump.space"
+ or die "$datadir/objdump.space: $!";
+$obj->reset();
+$obj->parse_objdump_output($objdump);
+close $objdump;
+
# Non-regression test for #506139
$sym = $obj->get_symbol('singlespace');
ok($sym, 'version less symbol separated by a single space are correctly
parsed');
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.ls
b/scripts/t/200_Dpkg_Shlibs/objdump.ls
index d024402..f679242 100644
--- a/scripts/t/200_Dpkg_Shlibs/objdump.ls
+++ b/scripts/t/200_Dpkg_Shlibs/objdump.ls
@@ -156,7 +156,6 @@ DYNAMIC SYMBOL TABLE:
00000000 DF *UND* 00000054 GLIBC_2.0 strcmp
00000000 DF *UND* 000000fa GLIBC_2.0 exit
00000000 DF *UND* 000004bc ACL_1.0 acl_from_text
-00000000 DF *UND* 00000075 singlespace
0805bc90 g D *ABS* 00000000 Base _end
0805b860 g DO .bss 00000004 GLIBC_2.0 stdout
0805b82c g D *ABS* 00000000 Base _edata
diff --git a/scripts/t/200_Dpkg_Shlibs/objdump.space
b/scripts/t/200_Dpkg_Shlibs/objdump.space
new file mode 100644
index 0000000..7ef3f90
--- /dev/null
+++ b/scripts/t/200_Dpkg_Shlibs/objdump.space
@@ -0,0 +1,8 @@
+
+phony-output: file format elf32-i386
+architecture: i386, flags 0x00000112:
+EXEC_P, HAS_SYMS, D_PAGED
+start address 0x08049b50
+
+DYNAMIC SYMBOL TABLE:
+00000000 DF *UND* 00000075 singlespace
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
