From: Raphael Hertzog <hertzog@debian.org>
Date: Sat, 22 Mar 2008 09:05:12 +0000 (+0100)
Subject: * scripts/t/200_Dpkg_Shlibs.t: Fix test suite to not barf on "objid" field.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=75159aa48089b25f75a80464bdd198ce7f259c1a;p=dpkg

* scripts/t/200_Dpkg_Shlibs.t: Fix test suite to not barf on "objid" field.
---

diff --git a/ChangeLog b/ChangeLog
index 8174cbbd..db204d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-22  Raphael Hertzog  <hertzog@debian.org>
+
+	* scripts/t/200_Dpkg_Shlibs.t: Fix test suite to handle the
+	recent addition of the "objid" field to symbol hash returned
+	by Dpkg::Shlibs::Objump::Object->get_symbol().
+
 2008-03-22  Ian Jackson  <ian@davenant.greenend.org.uk>
 
 	* lib/dpkg-db.h (enum pkgstatus): Sort entries.
diff --git a/scripts/t/200_Dpkg_Shlibs.t b/scripts/t/200_Dpkg_Shlibs.t
index 529bf511..28e2a5d1 100644
--- a/scripts/t/200_Dpkg_Shlibs.t
+++ b/scripts/t/200_Dpkg_Shlibs.t
@@ -64,13 +64,15 @@ is_deeply([ $obj->get_needed_libraries ], [ 'ld-linux.so.2' ], 'NEEDED');
 
 $sym = $obj->get_symbol('_sys_nerr@GLIBC_2.3');
 is_deeply( $sym, { name => '_sys_nerr', version => 'GLIBC_2.3',
-		   soname => 'libc.so.6', section => '.rodata', dynamic => 1,
+		   soname => 'libc.so.6', objid => 'libc.so.6',
+		   section => '.rodata', dynamic => 1,
 		   debug => '', type => 'O', weak => '',
 		   local => '', global => 1, visibility => '',
 		   hidden => 1, defined => 1 }, 'Symbol' );
 $sym = $obj->get_symbol('_IO_stdin_used');
 is_deeply( $sym, { name => '_IO_stdin_used', version => '',
-		   soname => 'libc.so.6', section => '*UND*', dynamic => 1,
+		   soname => 'libc.so.6', objid => 'libc.so.6',
+		   section => '*UND*', dynamic => 1,
 		   debug => '', type => ' ', weak => 1,
 		   local => '', global => '', visibility => '',   
 		   hidden => '', defined => '' }, 'Symbol 2' );
@@ -178,7 +180,8 @@ close $objdump;
 
 $sym = $obj->get_symbol('IA__g_free');
 is_deeply( $sym, { name => 'IA__g_free', version => '',
-		   soname => 'libglib-2.0.so.0', section => '.text', dynamic => 1,
+		   soname => 'libglib-2.0.so.0', objid => 'libglib-2.0.so.0',
+		   section => '.text', dynamic => 1,
 		   debug => '', type => 'F', weak => '',
 		   local => 1, global => '', visibility => 'hidden',
 		   hidden => '', defined => 1 },