Merged revisions 76815 via svnmerge from

mdickinson · mdickinson · commit 62eda4d0c477 · 2009-12-13T21:18:16.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r76815 | mark.dickinson | 2009-12-13 21:10:57 +0000 (Sun, 13 Dec 2009) | 10 lines Merged revisions 76813 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r76813 | mark.dickinson | 2009-12-13 21:06:06 +0000 (Sun, 13 Dec 2009) | 3 lines Issue #7492: Autoconf tests were leaving semaphore files behind. Add sem_unlink calls to delete those semaphore files. ........ ................
diff --git a/configure b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 76406 .
+# From configure.in Revision: 76567 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -22564,6 +22564,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 
@@ -22639,7 +22640,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <sys/stat.h>
 
 int main(void){
-  sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+  sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
   int count;
   int res;
   if(a==SEM_FAILED){
@@ -22649,6 +22650,7 @@ int main(void){
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 
diff --git a/configure.in b/configure.in
@@ -3359,6 +3359,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 ], ac_cv_posix_semaphores_enabled=yes,
@@ -3382,7 +3383,7 @@ AC_TRY_RUN([
 #include <sys/stat.h>
 
 int main(void){
-  sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR|S_IWUSR, 0);
+  sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR|S_IWUSR, 0);
   int count;
   int res;
   if(a==SEM_FAILED){
@@ -3392,6 +3393,7 @@ int main(void){
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# From configure.in Revision: 76406 .`
	`2`	`+# From configure.in Revision: 76567 .`
`3`	`3`	`# Guess values for system-dependent variables and create Makefiles.`
`4`	`4`	`# Generated by GNU Autoconf 2.61 for python 3.1.`
`5`	`5`	`#`
`@@ -22564,6 +22564,7 @@ int main(void) {`
`22564`	`22564`	`return 1;`
`22565`	`22565`	`}`
`22566`	`22566`	`sem_close(a);`
	`22567`	`+ sem_unlink("/autoconf");`
`22567`	`22568`	`return 0;`
`22568`	`22569`	`}`
`22569`	`22570`
`@@ -22639,7 +22640,7 @@ cat >>conftest.$ac_ext <<_ACEOF`
`22639`	`22640`	`#include <sys/stat.h>`
`22640`	`22641`
`22641`	`22642`	`int main(void){`
`22642`		`- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
	`22643`	`+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
`22643`	`22644`	`int count;`
`22644`	`22645`	`int res;`
`22645`	`22646`	`if(a==SEM_FAILED){`
`@@ -22649,6 +22650,7 @@ int main(void){`
`22649`	`22650`	`}`
`22650`	`22651`	`res = sem_getvalue(a, &count);`
`22651`	`22652`	`sem_close(a);`
	`22653`	`+ sem_unlink("/autocftw");`
`22652`	`22654`	`return res==-1 ? 1 : 0;`
`22653`	`22655`	`}`
`22654`	`22656`
Original file line number	Diff line number	Diff line change
`@@ -3359,6 +3359,7 @@ int main(void) {`
`3359`	`3359`	`return 1;`
`3360`	`3360`	`}`
`3361`	`3361`	`sem_close(a);`
	`3362`	`+ sem_unlink("/autoconf");`
`3362`	`3363`	`return 0;`
`3363`	`3364`	`}`
`3364`	`3365`	`], ac_cv_posix_semaphores_enabled=yes,`
`@@ -3382,7 +3383,7 @@ AC_TRY_RUN([`
`3382`	`3383`	`#include <sys/stat.h>`
`3383`	`3384`
`3384`	`3385`	`int main(void){`
`3385`		`- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
	`3386`	`+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
`3386`	`3387`	`int count;`
`3387`	`3388`	`int res;`
`3388`	`3389`	`if(a==SEM_FAILED){`
`@@ -3392,6 +3393,7 @@ int main(void){`
`3392`	`3393`	`}`
`3393`	`3394`	`res = sem_getvalue(a, &count);`
`3394`	`3395`	`sem_close(a);`
	`3396`	`+ sem_unlink("/autocftw");`
`3395`	`3397`	`return res==-1 ? 1 : 0;`
`3396`	`3398`	`}`
`3397`	`3399`	`]`