chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
importd: add new bus calls for importing local tar and raw images
[elogind.git]
/
src
/
test
/
test-barrier.c
diff --git
a/src/test/test-barrier.c
b/src/test/test-barrier.c
index ac9dd04b991f6d585e325ae28710f2605e6ca1ee..2d109a30e7f8ecf9ec3d6b3bb0ccfa2e0161c45b 100644
(file)
--- a/
src/test/test-barrier.c
+++ b/
src/test/test-barrier.c
@@
-28,15
+28,12
@@
* increase it at the slightly cost of lengthen test-duration on other machines.
*/
* increase it at the slightly cost of lengthen test-duration on other machines.
*/
-#include <errno.h>
#include <stdio.h>
#include <stdio.h>
-#include <string.h>
#include <sys/time.h>
#include <sys/wait.h>
#include <unistd.h>
#include "barrier.h"
#include <sys/time.h>
#include <sys/wait.h>
#include <unistd.h>
#include "barrier.h"
-#include "def.h"
#include "util.h"
/* 20ms to test deadlocks; All timings use multiples of this constant as
#include "util.h"
/* 20ms to test deadlocks; All timings use multiples of this constant as
@@
-64,6
+61,10
@@
static void sleep_for(usec_t usecs) {
pid_t pid1, pid2; \
\
assert_se(barrier_create(&b) >= 0); \
pid_t pid1, pid2; \
\
assert_se(barrier_create(&b) >= 0); \
+ assert_se(b.me > 0); \
+ assert_se(b.them > 0); \
+ assert_se(b.pipe[0] > 0); \
+ assert_se(b.pipe[1] > 0); \
\
pid1 = fork(); \
assert_se(pid1 >= 0); \
\
pid1 = fork(); \
assert_se(pid1 >= 0); \
@@
-176,7
+177,7
@@
TEST_BARRIER(test_barrier_wait_next_twice,
set_alarm(BASE_TIME * 10);
assert_se(barrier_place(&b));
assert_se(barrier_place(&b));
set_alarm(BASE_TIME * 10);
assert_se(barrier_place(&b));
assert_se(barrier_place(&b));
- sleep_for(BASE_TIME *
2
);
+ sleep_for(BASE_TIME *
4
);
}),
TEST_BARRIER_WAIT_SUCCESS(pid2));
}),
TEST_BARRIER_WAIT_SUCCESS(pid2));
@@
-201,7
+202,7
@@
TEST_BARRIER(test_barrier_wait_next_twice_local,
set_alarm(BASE_TIME * 10);
assert_se(barrier_place(&b));
assert_se(barrier_place(&b));
set_alarm(BASE_TIME * 10);
assert_se(barrier_place(&b));
assert_se(barrier_place(&b));
- sleep_for(BASE_TIME *
2
);
+ sleep_for(BASE_TIME *
4
);
}),
TEST_BARRIER_WAIT_SUCCESS(pid2));
}),
TEST_BARRIER_WAIT_SUCCESS(pid2));