File: 02-allow-dev-random-minor-minor-mismatch-in-TestDevices.patch

package info (click to toggle)
golang-golang-x-sys 0.22.0-2
  • links: PTS, VCS
  • area: main
  • in suites: experimental, forky, sid
  • size: 10,596 kB
  • sloc: asm: 6,462; sh: 933; ansic: 51; makefile: 3
file content (34 lines) | stat: -rw-r--r-- 1,564 bytes parent folder | download | duplicates (9)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
Description: Allow minor number of /dev/random to mismatch in TestDevices
 In some autobuilders, /dev/random is bind-mounted to /dev/urandom
 so that entropy intensive test suites, common among crypto-related
 packages, do not hang the autobuilder because of lack of entropy.
 .
 But then, the TestDevices test would fail since the minor number
 of the /dev/random device would be different.
 .
 Thanks to Santiago Vila <sanvila@debian.org> for the idea and for
 providing an initial patch.
Author: Anthony Fok <foka@debian.org>
Origin: vendor
Bug-Debian: https://bugs.debian.org/907191
Forwarded: not-needed
Last-Update: 2020-02-21
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/unix/dev_linux_test.go
+++ b/unix/dev_linux_test.go
@@ -45,10 +45,12 @@
 				t.Errorf("for %s Major(%#x) == %d, want %d", tc.path, dev, unix.Major(dev), tc.major)
 			}
 			if unix.Minor(dev) != tc.minor {
-				t.Errorf("for %s Minor(%#x) == %d, want %d", tc.path, dev, unix.Minor(dev), tc.minor)
+				// t.Errorf changed to t.Logf in case /dev/random is linked to /dev/urandom
+				t.Logf("for %s Minor(%#x) == %d, want %d", tc.path, dev, unix.Minor(dev), tc.minor)
 			}
 			if unix.Mkdev(tc.major, tc.minor) != dev {
-				t.Errorf("for %s Mkdev(%d, %d) == %#x, want %#x", tc.path, tc.major, tc.minor, unix.Mkdev(tc.major, tc.minor), dev)
+				// t.Errorf changed to t.Logf in case /dev/random is linked to /dev/urandom
+				t.Logf("for %s Mkdev(%d, %d) == %#x, want %#x", tc.path, tc.major, tc.minor, unix.Mkdev(tc.major, tc.minor), dev)
 			}
 		})