|
From: <sv...@va...> - 2006-12-11 01:12:21
|
Author: sewardj
Date: 2006-12-11 01:12:18 +0000 (Mon, 11 Dec 2006)
New Revision: 6392
Log:
On SuSE 10.1 (amd64) fd 4 seems to be open at process start. Close it
so as to get consistent test results.
Modified:
trunk/none/tests/fdleak_cmsg.c
trunk/none/tests/fdleak_creat.c
trunk/none/tests/fdleak_dup.c
trunk/none/tests/fdleak_dup2.c
trunk/none/tests/fdleak_fcntl.c
trunk/none/tests/fdleak_ipv4.c
trunk/none/tests/fdleak_open.c
trunk/none/tests/fdleak_socketpair.c
Modified: trunk/none/tests/fdleak_cmsg.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_cmsg.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_cmsg.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -184,7 +184,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
pid =3D getpid();
sprintf(filea, "/tmp/data1.%d", pid);
Modified: trunk/none/tests/fdleak_creat.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_creat.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_creat.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -12,7 +12,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
sprintf(filename, "/tmp/file.%d\n", getpid());
creat(filename, 0);
Modified: trunk/none/tests/fdleak_dup.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_dup.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_dup.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -11,7 +11,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
s =3D open("/dev/null", O_RDONLY);
dup(s);
Modified: trunk/none/tests/fdleak_dup2.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_dup2.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_dup2.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -12,7 +12,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
s1 =3D open("/dev/null", O_RDONLY);
s2 =3D open("/dev/null", O_RDONLY);
Modified: trunk/none/tests/fdleak_fcntl.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_fcntl.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_fcntl.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -12,7 +12,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
s1 =3D open("/dev/null", O_RDONLY);
if(fcntl(s1, F_DUPFD, s1) =3D=3D -1) perror("fcntl");
Modified: trunk/none/tests/fdleak_ipv4.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_ipv4.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_ipv4.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -94,7 +94,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
if((pid =3D fork()) =3D=3D 0) {
server();
Modified: trunk/none/tests/fdleak_open.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_open.c 2006-12-11 01:11:02 UTC (rev 6391)
+++ trunk/none/tests/fdleak_open.c 2006-12-11 01:12:18 UTC (rev 6392)
@@ -8,7 +8,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
open("/dev/null", O_RDONLY);
return 0;
Modified: trunk/none/tests/fdleak_socketpair.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/none/tests/fdleak_socketpair.c 2006-12-11 01:11:02 UTC (rev 639=
1)
+++ trunk/none/tests/fdleak_socketpair.c 2006-12-11 01:12:18 UTC (rev 639=
2)
@@ -10,7 +10,7 @@
* now to get consistent results across different releases.
*/
=20
- close(10);
+ close(10); close(4);
=20
socketpair(AF_UNIX, SOCK_STREAM, PF_UNIX, fds);
return 0;
|