From 0ce6af9f1892cb6137e3c05fb0adf763d03f3fea Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 20 Apr 2018 14:43:17 -0700 Subject: [release-branch.go1.9] misc/cgo/testcshared: use file descriptor 30 for TestUnexportedSymbols Backport of CL 108537 to 1.9 release branch. We were using file descriptor 100, which requires the Linux kernel to grow the fdtable size. That step may sometimes require a long time, causing the test to fail. Switch to file descriptor 30, which should not require growing the fdtable. Updates #23784 Fixes #25278 Change-Id: I19ea6ab1724ec1807643d5111c44631e20be76b0 Reviewed-on: https://go-review.googlesource.com/111996 Run-TryBot: Ian Lance Taylor TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- misc/cgo/testcshared/main2.c | 2 +- misc/cgo/testcshared/src/libgo2/libgo2.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/cgo/testcshared/main2.c b/misc/cgo/testcshared/main2.c index 6e8bf141ca..1a3f1d7545 100644 --- a/misc/cgo/testcshared/main2.c +++ b/misc/cgo/testcshared/main2.c @@ -9,7 +9,7 @@ #include #include -#define fd (100) +#define fd (30) // Tests libgo2.so, which does not export any functions. // Read a string from the file descriptor and print it. diff --git a/misc/cgo/testcshared/src/libgo2/libgo2.go b/misc/cgo/testcshared/src/libgo2/libgo2.go index 1b69d8f09f..e57c93b77d 100644 --- a/misc/cgo/testcshared/src/libgo2/libgo2.go +++ b/misc/cgo/testcshared/src/libgo2/libgo2.go @@ -21,7 +21,7 @@ import ( // that the C code can also use. const ( - fd = 100 + fd = 30 ) func init() { -- cgit v1.2.3-54-g00ecf