Merged revisions 76813 via svnmerge from

mdickinson · mdickinson · commit ba79b35772ab · 2009-12-13T21:10:57.000Z
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: 76645 .
+# From configure.in Revision: 76779 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -23782,6 +23782,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 
@@ -23856,7 +23857,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){
@@ -23866,6 +23867,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
@@ -3324,6 +3324,7 @@ int main(void) {
     return 1;
   }
   sem_close(a);
+  sem_unlink("/autoconf");
   return 0;
 }
 ], ac_cv_posix_semaphores_enabled=yes,
@@ -3348,7 +3349,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){
@@ -3358,6 +3359,7 @@ int main(void){
   }
   res = sem_getvalue(a, &count);
   sem_close(a);
+  sem_unlink("/autocftw");
   return res==-1 ? 1 : 0;
 }
 ], ac_cv_broken_sem_getvalue=no,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#! /bin/sh`
`2`		`-# From configure.in Revision: 76645 .`
	`2`	`+# From configure.in Revision: 76779 .`
`3`	`3`	`# Guess values for system-dependent variables and create Makefiles.`
`4`	`4`	`# Generated by GNU Autoconf 2.61 for python 3.2.`
`5`	`5`	`#`
`@@ -23782,6 +23782,7 @@ int main(void) {`
`23782`	`23782`	`return 1;`
`23783`	`23783`	`}`
`23784`	`23784`	`sem_close(a);`
	`23785`	`+ sem_unlink("/autoconf");`
`23785`	`23786`	`return 0;`
`23786`	`23787`	`}`
`23787`	`23788`
`@@ -23856,7 +23857,7 @@ cat >>conftest.$ac_ext <<_ACEOF`
`23856`	`23857`	`#include <sys/stat.h>`
`23857`	`23858`
`23858`	`23859`	`int main(void){`
`23859`		`- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
	`23860`	`+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
`23860`	`23861`	`int count;`
`23861`	`23862`	`int res;`
`23862`	`23863`	`if(a==SEM_FAILED){`
`@@ -23866,6 +23867,7 @@ int main(void){`
`23866`	`23867`	`}`
`23867`	`23868`	`res = sem_getvalue(a, &count);`
`23868`	`23869`	`sem_close(a);`
	`23870`	`+ sem_unlink("/autocftw");`
`23869`	`23871`	`return res==-1 ? 1 : 0;`
`23870`	`23872`	`}`
`23871`	`23873`
Original file line number	Diff line number	Diff line change
`@@ -3324,6 +3324,7 @@ int main(void) {`
`3324`	`3324`	`return 1;`
`3325`	`3325`	`}`
`3326`	`3326`	`sem_close(a);`
	`3327`	`+ sem_unlink("/autoconf");`
`3327`	`3328`	`return 0;`
`3328`	`3329`	`}`
`3329`	`3330`	`], ac_cv_posix_semaphores_enabled=yes,`
`@@ -3348,7 +3349,7 @@ AC_TRY_RUN([`
`3348`	`3349`	`#include <sys/stat.h>`
`3349`	`3350`
`3350`	`3351`	`int main(void){`
`3351`		`- sem_t *a = sem_open("/autoconf", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
	`3352`	`+ sem_t *a = sem_open("/autocftw", O_CREAT, S_IRUSR\|S_IWUSR, 0);`
`3352`	`3353`	`int count;`
`3353`	`3354`	`int res;`
`3354`	`3355`	`if(a==SEM_FAILED){`
`@@ -3358,6 +3359,7 @@ int main(void){`
`3358`	`3359`	`}`
`3359`	`3360`	`res = sem_getvalue(a, &count);`
`3360`	`3361`	`sem_close(a);`
	`3362`	`+ sem_unlink("/autocftw");`
`3361`	`3363`	`return res==-1 ? 1 : 0;`
`3362`	`3364`	`}`
`3363`	`3365`	`], ac_cv_broken_sem_getvalue=no,`