cmd/internal/obj/riscv: fix and enable test in short mode

The branch test only takes a few seconds so enable it in short mode. Also fix a
typo that currently prevents the code from compiling.

Change-Id: I25fc646b002a66c042c61fb1f56d5efa8e47903c
Reviewed-on: https://go-review.googlesource.com/c/go/+/356249
Trust: Joel Sing <joel@sing.id.au>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>

diff --git a/src/cmd/internal/obj/riscv/asm_test.go b/src/cmd/internal/obj/riscv/asm_test.go
index f8f7b4f2ced0756c5c9ea868cf074a0e55062060..684c6b61f24a56a8439791ead7274a1fbfa27e22 100644 (file)
--- a/src/cmd/internal/obj/riscv/asm_test.go
+++ b/src/cmd/internal/obj/riscv/asm_test.go
@@ -134,9 +134,6 @@ TEXT _stub(SB),$0-0
 }
 
 func TestBranch(t *testing.T) {
-       if testing.Short() {
-               t.Skip("Skipping in short mode")
-       }
        if runtime.GOARCH != "riscv64" {
                t.Skip("Requires riscv64 to run")
        }

diff --git a/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.go b/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.go
index de412c64a7832b4ab4dfed9c87dd25d446a25d0d..68d9589bf26174d3da3f24d07f3ef5d5cb31533a 100644 (file)
--- a/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.go
+++ b/src/cmd/internal/obj/riscv/testdata/testbranch/branch_test.go
@@ -32,7 +32,7 @@ func testGoBGTU(a, b int64) bool { return uint64(a) > uint64(b) }
 func testGoBLE(a, b int64) bool  { return a <= b }
 func testGoBLEU(a, b int64) bool { return uint64(a) <= uint64(b) }
 func testGoBLT(a, b int64) bool  { return a < b }
-func testGoBLTZ(a, b int64) bool { return uint64(a) < uint64(b) }
+func testGoBLTU(a, b int64) bool { return uint64(a) < uint64(b) }
 
 func TestBranchCondition(t *testing.T) {
        tests := []struct {