From f2fab8347d88216afa60826ea7741435d680acbb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 8 Nov 2023 22:08:29 -0800 Subject: [PATCH] Fix TestReverseSlice for go 1.21 Go 1.21 does a better job using the same empty allocation for empty slices, check for cap > 0 before requiring slices to have different backing arrays. Bug: 309895579 Test: TestReverseSlice Change-Id: Ic48e9cf2c95ea0b810a11cdc4a794a70c02a0a61 --- android/util_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/util_test.go b/android/util_test.go index 20161e52d..699135bfc 100644 --- a/android/util_test.go +++ b/android/util_test.go @@ -811,7 +811,7 @@ func TestReverseSlice(t *testing.T) { if !reflect.DeepEqual(slice, testCase.expected) { t.Errorf("expected %#v, got %#v", testCase.expected, slice) } - if slice != nil && unsafe.SliceData(testCase.in) == unsafe.SliceData(slice) { + if cap(slice) > 0 && unsafe.SliceData(testCase.in) == unsafe.SliceData(slice) { t.Errorf("expected slices to have different backing arrays") } })