Condense the two tests into one and add a "-M entry:" for the second label.

2 files changed, 10 insertions, 23 deletions

diff --git a/binutils/testsuite/ChangeLog b/binutils/testsuite/ChangeLog
index bd490af..25eabb7 100644
--- a/binutils/testsuite/ChangeLog
+++ b/binutils/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-04  Jan-Benedict Glaw  <jbglaw@lug-owl.>
+
+	* binutils-all/vax/objdump.exp: Condense the two tests into one
+	and add a "-M entry:" for the second label.
+
 2005-03-29  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* binutils-all/vax: New directory.
diff --git a/binutils/testsuite/binutils-all/vax/objdump.exp b/binutils/testsuite/binutils-all/vax/objdump.exp
index dd81633..b8bf221 100644
--- a/binutils/testsuite/binutils-all/vax/objdump.exp
+++ b/binutils/testsuite/binutils-all/vax/objdump.exp
@@ -45,11 +45,12 @@ if [is_remote host] {
 }
 
 #
-# First run. We expect the function to be a function and the sole label
-# not to produce an entry mask.
+# We check both function entry points. The second one at offset 2 will
+# show up automatically on ELF targets, but needs to be set on a.out
+# targets.
 #
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -d $objfile"]
-set want1 "\[ 	\]+0:\[ 	\]+10 01\[ 	\]+bsbb 3"
+set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -d -M entry:0x0 -M entry:2 $objfile"]
+set want1 "\[ 	\]+0:\[ 	\]+10 01\[ 	\]+\\.word 0x0110.\*r8 r4"
 set want2 "\[ 	\]+2:\[ 	\]+24 02\[ 	\]+\\.word 0x0224.\*r9 r5 r2"
 if [regexp $want1 $got] then {
     pass "entrymask test 1"
@@ -61,22 +62,3 @@ if [regexp $want2 $got] then {
 } else {
     fail "entrymask test 2"
 }
-
-#
-# Second run. Now, we force the label as a function, so we expect that
-# it also produces an entry mask, as any call'able function should.
-#
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS -d -M entry:0x0 $objfile"]
-set want3 "\[ 	\]+0:\[ 	\]+10 01\[ 	\]+\\.word 0x0110.\*r8 r4"
-set want4 "\[ 	\]+2:\[ 	\]+24 02\[ 	\]+\\.word 0x0224.\*r9 r5 r2"
-if [regexp $want3 $got] then {
-    pass "entrymask test 3"
-} else {
-    fail "entrymask test 3"
-}
-if [regexp $want4 $got] then {
-    pass "entrymask test 4"
-} else {
-    fail "entrymask test 4"
-}
-