1 files changed, 52 insertions, 49 deletions
diff --git a/binutils/testsuite/binutils-all/arm/objdump.exp b/binutils/testsuite/binutils-all/arm/objdump.exp
index 0e74ebb..3485d3a 100644
--- a/binutils/testsuite/binutils-all/arm/objdump.exp
+++ b/binutils/testsuite/binutils-all/arm/objdump.exp
@@ -34,35 +34,36 @@ send_user "Version [binutil_version $OBJDUMP]"
 ###########################
 
 if {![binutils_assemble $srcdir/$subdir/thumb2-cond.s tmpdir/thumb2-cond.o]} then {
-    return
-}
-
-if [is_remote host] {
-    set objfile [remote_download host tmpdir/thumb2-cond.o]
+    fail "thumb2-cond (assembling)"
 } else {
-    set objfile tmpdir/thumb2-cond.o
-}
 
-# Make sure that conditional instructions are correctly decoded.
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/thumb2-cond.o]
+    } else {
+	set objfile tmpdir/thumb2-cond.o
+    }
 
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=6 $objfile"]
+    # Make sure that conditional instructions are correctly decoded.
 
-set want "bcc.w\[ \t\]*e12.*bx\[ \t\]*lr"
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=6 $objfile"]
 
-if [regexp $want $got] then {
-    pass "thumb2-cond test1"
-} else {
-    fail "thumb2-cond test1"
-}
+    set want "bcc.w\[ \t\]*e12.*bx\[ \t\]*lr"
 
-set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=10 $objfile"]
+    if [regexp $want $got] then {
+	pass "thumb2-cond test1"
+    } else {
+	fail "thumb2-cond test1"
+    }
 
-set want "bx\[ \t\]*lr"
+    set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=10 $objfile"]
 
-if [regexp $want $got] then {
-    pass "thumb2-cond test2"
-} else {
-    fail "thumb2-cond test2"
+    set want "bx\[ \t\]*lr"
+
+    if [regexp $want $got] then {
+	pass "thumb2-cond test2"
+    } else {
+	fail "thumb2-cond test2"
+    }
 }
 
 ###########################
@@ -70,45 +71,47 @@ if [regexp $want $got] then {
 ###########################
 
 if {![binutils_assemble $srcdir/$subdir/simple.s tmpdir/simple.o]} then {
-    return
-}
-
-if [is_remote host] {
-    set objfile [remote_download host tmpdir/simple.o]
+    fail "multiple input files"
 } else {
-    set objfile tmpdir/simple.o
-}
 
-# Make sure multiple disassemblies come out the same
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/simple.o]
+    } else {
+	set objfile tmpdir/simple.o
+    }
 
-set got [binutils_run $OBJDUMP "-dr $objfile $objfile"]
+    # Make sure multiple disassemblies come out the same
 
-set want "$objfile:\[ \]*file format.*$objfile:\[ \]*file format.*push.*add.*sub.*str.*add.*ldmfd"
+    set got [binutils_run $OBJDUMP "-dr $objfile $objfile"]
 
-if [regexp $want $got] then {
-    pass "multiple input files"
-} else {
-    fail "multiple input files"
-}
+    set want "$objfile:\[ \]*file format.*$objfile:\[ \]*file format.*push.*add.*sub.*str.*add.*ldmfd"
 
-if {![binutils_assemble $srcdir/$subdir/rvct_symbol.s tmpdir/rvct_symbol.o]} then {
-    return
+    if [regexp $want $got] then {
+	pass "multiple input files"
+    } else {
+	fail "multiple input files"
+    }
 }
 
-if [is_remote host] {
-    set objfile [remote_download host tmpdir/rvct_symbol.o]
+if {![binutils_assemble $srcdir/$subdir/rvct_symbol.s tmpdir/rvct_symbol.o]} then {
+    fail "skip rvct symbol"
 } else {
-    set objfile tmpdir/rvct_symbol.o
-}
 
-# Make sure multiple disassemblies come out the same
+    if [is_remote host] {
+	set objfile [remote_download host tmpdir/rvct_symbol.o]
+    } else {
+	set objfile tmpdir/rvct_symbol.o
+    }
 
-set got [binutils_run $OBJDUMP "-D $objfile $objfile"]
+    # Make sure multiple disassemblies come out the same
 
-set want "foo.*global_a.*global_b"
+    set got [binutils_run $OBJDUMP "-D $objfile $objfile"]
 
-if [regexp $want $got] then {
-    pass "skip rvct symbol"
-} else {
-    fail "skip rvct symbol"
+    set want "foo.*global_a.*global_b"
+
+    if [regexp $want $got] then {
+	pass "skip rvct symbol"
+    } else {
+	fail "skip rvct symbol"
+    }
 }