next step for 6.out on Borg: fix and test
net code on IPv4-only machines.
R=r
DELTA=27 (25 added, 0 deleted, 2 changed)
OCL=28404
CL=28411
diff --git a/src/lib/net/dialgoogle_test.go b/src/lib/net/dialgoogle_test.go
index 690ba57..1e0c0aa 100644
--- a/src/lib/net/dialgoogle_test.go
+++ b/src/lib/net/dialgoogle_test.go
@@ -10,6 +10,7 @@
"io";
"net";
"os";
+ "syscall";
"testing";
)
@@ -81,7 +82,17 @@
doDialTCP(t, "tcp", addr);
if addr[0] != '[' {
doDial(t, "tcp4", addr);
- doDialTCP(t, "tcp4", addr)
+ doDialTCP(t, "tcp4", addr);
+
+ if !preferIPv4 {
+ // make sure preferIPv4 flag works.
+ preferIPv4 = true;
+ syscall.SocketDisableIPv6 = true;
+ doDial(t, "tcp4", addr);
+ doDialTCP(t, "tcp4", addr);
+ syscall.SocketDisableIPv6 = false;
+ preferIPv4 = false;
+ }
}
doDial(t, "tcp6", addr);
doDialTCP(t, "tcp6", addr)
