git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
tests
/
test-lockfile.c
diff --git
a/tests/test-lockfile.c
b/tests/test-lockfile.c
index
b37fd22
..
99f6879
100644
(file)
--- a/
tests/test-lockfile.c
+++ b/
tests/test-lockfile.c
@@
-96,7
+96,6
@@
do_fork(void)
{
switch (fork()) {
case 0:
{
switch (fork()) {
case 0:
- time_postfork();
lockfile_postfork();
return CHILD;
lockfile_postfork();
return CHILD;
@@
-270,11
+269,11
@@
static const struct test tests[] = {
int
main(int argc, char *argv[])
{
int
main(int argc, char *argv[])
{
- extern struct vlog_module VLM_lockfile;
size_t i;
set_program_name(argv[0]);
size_t i;
set_program_name(argv[0]);
- vlog_set_levels(&VLM_lockfile, VLF_ANY_FACILITY, VLL_ERR);
+ vlog_set_pattern(VLF_CONSOLE, "%c|%p|%m");
+ vlog_set_levels(NULL, VLF_SYSLOG, VLL_OFF);
if (argc != 2) {
ovs_fatal(0, "exactly one argument required; use \"%s help\" for help",
if (argc != 2) {
ovs_fatal(0, "exactly one argument required; use \"%s help\" for help",