Subzero: Adjust expectations now that llvm-mc aligns calls not just naclcall.

tests_lit/llvm2ice_tests/branch-opt.ll

Index: tests_lit/llvm2ice_tests/branch-opt.ll
diff --git a/tests_lit/llvm2ice_tests/branch-opt.ll b/tests_lit/llvm2ice_tests/branch-opt.ll
index 37dc548bd615ee3fa975fc8acc6c683cb966d3bc..257e802eedbb5cd0ce9ba76121d30943bd83fa61 100644
--- a/tests_lit/llvm2ice_tests/branch-opt.ll
+++ b/tests_lit/llvm2ice_tests/branch-opt.ll
@@ -25,12 +25,15 @@ next:
 }
 ; O2-LABEL: testUncondToNextBlock
 ; O2: call
-; O2-NEXT: call
+; There will be nops for bundle align to end (for NaCl), but there should
+; not be a branch.
+; O2-NOT: j
+; O2: call
 
 ; OM1-LABEL: testUncondToNextBlock
 ; OM1: call
 ; OM1-NEXT: jmp
-; OM1-NEXT: call
+; OM1: call
 
 ; For a conditional branch with a fallthrough to the next block, the
 ; fallthrough branch should be removed.
@@ -48,7 +51,8 @@ target:
 ; O2-LABEL: testCondFallthroughToNextBlock
 ; O2: cmp {{.*}}, 123
 ; O2-NEXT: jge
-; O2-NEXT: call
+; O2-NOT: j
+; O2: call
 ; O2: ret
 ; O2: call
 ; O2: ret
@@ -82,7 +86,8 @@ target:
 ; O2-LABEL: testCondTargetNextBlock
 ; O2: cmp {{.*}}, 123
 ; O2-NEXT: jl
-; O2-NEXT: call
+; O2-NOT: j
+; O2: call
 ; O2: ret
 ; O2: call
 ; O2: ret