mirror of
https://github.com/void-linux/void-packages.git
synced 2025-10-13 05:55:12 +02:00
604abefcb1
Additionally applied patch that making tests compatible with 32bit i686 build. Closes: #54852 [via git-merge-pr]
59 lines
1.9 KiB
Diff
59 lines
1.9 KiB
Diff
From 0addaedb77cd1badc5aa036f4b9cab5fe3fa0d19 Mon Sep 17 00:00:00 2001
|
|
From: sn0w <me@sn0w.cx>
|
|
Date: Sat, 22 Feb 2025 21:48:41 +0100
|
|
Subject: [PATCH 2/2] nilnil: use 32bit-compatible test values
|
|
|
|
---
|
|
pkg/golinters/nilnil/testdata/nilnil.go | 4 ++--
|
|
pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go | 2 +-
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/pkg/golinters/nilnil/testdata/nilnil.go b/pkg/golinters/nilnil/testdata/nilnil.go
|
|
index 2446df77..2f7dcbdb 100644
|
|
--- a/pkg/golinters/nilnil/testdata/nilnil.go
|
|
+++ b/pkg/golinters/nilnil/testdata/nilnil.go
|
|
@@ -275,11 +275,11 @@ func unsafePtrValid() (unsafe.Pointer, error) {
|
|
|
|
func uintPtrValid() (uintptr, error) {
|
|
if false {
|
|
return 0, io.EOF
|
|
}
|
|
- return 0xc82000c290, nil
|
|
+ return 0xabcd, nil
|
|
}
|
|
|
|
func channelTypeValid() (ChannelType, error) {
|
|
if false {
|
|
return nil, io.EOF
|
|
@@ -347,11 +347,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) {
|
|
|
|
func uintPtrOpposite() (uintptr, error) {
|
|
if false {
|
|
return 0, io.EOF
|
|
}
|
|
- return 0xc82000c290, wrap(io.EOF)
|
|
+ return 0xabcd, wrap(io.EOF)
|
|
}
|
|
|
|
func channelTypeOpposite() (ChannelType, error) {
|
|
if false {
|
|
return nil, io.EOF
|
|
diff --git a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
|
|
index 799d86de..6ef18cae 100644
|
|
--- a/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
|
|
+++ b/pkg/golinters/nilnil/testdata/nilnil_detect_opposite.go
|
|
@@ -35,11 +35,11 @@ func unsafePtrOpposite() (unsafe.Pointer, error) {
|
|
|
|
func uintPtrOpposite() (uintptr, error) {
|
|
if false {
|
|
return 0, io.EOF
|
|
}
|
|
- return 0xc82000c290, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead"
|
|
+ return 0xabcd, wrap(io.EOF) // want "return both a non-nil error and a valid value: use separate returns instead"
|
|
}
|
|
|
|
func channelTypeOpposite() (ChannelType, error) {
|
|
if false {
|
|
return nil, io.EOF
|
|
--
|
|
2.48.1
|