Skip to content

Commit ee4811d

Browse files
committed
tests: merge TestSuite.c from libbson
1 parent 95a91b3 commit ee4811d

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

tests/TestSuite.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
# include <sys/time.h>
3737
#else
3838
# include <windows.h>
39-
# include <process.h>
4039
#endif
4140

4241
#if defined(BSON_HAVE_CLOCK_GETTIME)
@@ -194,27 +193,22 @@ static void
194193
TestSuite_SeedRand (TestSuite *suite, /* IN */
195194
Test *test) /* IN */
196195
{
197-
int pid;
198196
#ifndef BSON_OS_WIN32
199197
int fd = open ("/dev/urandom", O_RDONLY);
200198
int n_read;
201-
int seed;
199+
unsigned seed;
202200
if (fd != -1) {
203201
n_read = read (fd, &seed, 4);
204202
assert (n_read == 4);
205203
close (fd);
206204
test->seed = seed;
207205
return;
206+
} else {
207+
test->seed = (unsigned)time (NULL) * (unsigned)getpid ();
208208
}
209-
#endif
210-
211-
#ifdef _WIN32
212-
pid = (int)_getpid ();
213209
#else
214-
pid = getpid ();
210+
test->seed = (unsigned)time (NULL);
215211
#endif
216-
217-
test->seed = time (NULL) * pid;
218212
}
219213

220214

@@ -247,7 +241,13 @@ TestSuite_Init (TestSuite *suite,
247241
}
248242
filename = argv [++i];
249243
if (0 != strcmp ("-", filename)) {
244+
#ifdef _WIN32
245+
if (0 != fopen_s (&suite->outfile, filename, "w")) {
246+
suite->outfile = NULL;
247+
}
248+
#else
250249
suite->outfile = fopen (filename, "w");
250+
#endif
251251
if (!suite->outfile) {
252252
fprintf (stderr, "Failed to open log file: %s\n", filename);
253253
}
@@ -612,15 +612,13 @@ TestSuite_RunParallel (TestSuite *suite) /* IN */
612612
}
613613

614614
#ifdef _WIN32
615-
Sleep (60000);
615+
Sleep (30000);
616616
#else
617-
sleep (60);
617+
sleep (30);
618618
#endif
619619

620620
fprintf (stderr, "Timed out, aborting!\n");
621621

622-
exit (EXIT_FAILURE);
623-
624622
abort ();
625623
}
626624

0 commit comments

Comments
 (0)