File tree Expand file tree Collapse file tree 1 file changed +12
-14
lines changed Expand file tree Collapse file tree 1 file changed +12
-14
lines changed Original file line number Diff line number Diff line change 36
36
# include <sys/time.h>
37
37
#else
38
38
# include <windows.h>
39
- # include <process.h>
40
39
#endif
41
40
42
41
#if defined(BSON_HAVE_CLOCK_GETTIME )
@@ -194,27 +193,22 @@ static void
194
193
TestSuite_SeedRand (TestSuite * suite , /* IN */
195
194
Test * test ) /* IN */
196
195
{
197
- int pid ;
198
196
#ifndef BSON_OS_WIN32
199
197
int fd = open ("/dev/urandom" , O_RDONLY );
200
198
int n_read ;
201
- int seed ;
199
+ unsigned seed ;
202
200
if (fd != -1 ) {
203
201
n_read = read (fd , & seed , 4 );
204
202
assert (n_read == 4 );
205
203
close (fd );
206
204
test -> seed = seed ;
207
205
return ;
206
+ } else {
207
+ test -> seed = (unsigned )time (NULL ) * (unsigned )getpid ();
208
208
}
209
- #endif
210
-
211
- #ifdef _WIN32
212
- pid = (int )_getpid ();
213
209
#else
214
- pid = getpid ( );
210
+ test -> seed = ( unsigned ) time ( NULL );
215
211
#endif
216
-
217
- test -> seed = time (NULL ) * pid ;
218
212
}
219
213
220
214
@@ -247,7 +241,13 @@ TestSuite_Init (TestSuite *suite,
247
241
}
248
242
filename = argv [++ i ];
249
243
if (0 != strcmp ("-" , filename )) {
244
+ #ifdef _WIN32
245
+ if (0 != fopen_s (& suite -> outfile , filename , "w" )) {
246
+ suite -> outfile = NULL ;
247
+ }
248
+ #else
250
249
suite -> outfile = fopen (filename , "w" );
250
+ #endif
251
251
if (!suite -> outfile ) {
252
252
fprintf (stderr , "Failed to open log file: %s\n" , filename );
253
253
}
@@ -612,15 +612,13 @@ TestSuite_RunParallel (TestSuite *suite) /* IN */
612
612
}
613
613
614
614
#ifdef _WIN32
615
- Sleep (60000 );
615
+ Sleep (30000 );
616
616
#else
617
- sleep (60 );
617
+ sleep (30 );
618
618
#endif
619
619
620
620
fprintf (stderr , "Timed out, aborting!\n" );
621
621
622
- exit (EXIT_FAILURE );
623
-
624
622
abort ();
625
623
}
626
624
You can’t perform that action at this time.
0 commit comments