103 lines
3.0 KiB
Diff
103 lines
3.0 KiB
Diff
|
From 10048229ed3030fe47b35a2200e33c45e3e97a84 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aki Tuomi <aki.tuomi@dovecot.fi>
|
||
|
|
Date: Fri, 23 Nov 2018 15:33:20 +0200
|
||
|
|
Subject: [PATCH 1/2] lib-master: test-event-stats - Include signal.h
|
||
|
|
|
||
|
|
Forgotten in e16ba6f
|
||
|
|
---
|
||
|
|
src/lib-master/test-event-stats.c | 1 +
|
||
|
|
1 file changed, 1 insertion(+)
|
||
|
|
|
||
|
|
diff --git a/src/lib-master/test-event-stats.c b/src/lib-master/test-event-stats.c
|
||
|
|
index 41d6f01e76..8fcb3dd22d 100644
|
||
|
|
--- a/src/lib-master/test-event-stats.c
|
||
|
|
+++ b/src/lib-master/test-event-stats.c
|
||
|
|
@@ -13,6 +13,7 @@
|
||
|
|
#include "test-common.h"
|
||
|
|
#include <fcntl.h>
|
||
|
|
#include <unistd.h>
|
||
|
|
+#include <signal.h>
|
||
|
|
#include <sys/socket.h>
|
||
|
|
#include <sys/un.h>
|
||
|
|
#include <sys/wait.h>
|
||
|
|
|
||
|
|
From de42b54aaf165d4f62b45be864dde36bdbbc4276 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aki Tuomi <aki.tuomi@dovecot.fi>
|
||
|
|
Date: Fri, 23 Nov 2018 15:34:51 +0200
|
||
|
|
Subject: [PATCH 2/2] lib-master: test-event-stats - Use PRIu64 format
|
||
|
|
|
||
|
|
Forgotten in e16ba6f
|
||
|
|
---
|
||
|
|
src/lib-master/test-event-stats.c | 22 +++++++++++-----------
|
||
|
|
1 file changed, 11 insertions(+), 11 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/lib-master/test-event-stats.c b/src/lib-master/test-event-stats.c
|
||
|
|
index 8fcb3dd22d..2d8a13cd40 100644
|
||
|
|
--- a/src/lib-master/test-event-stats.c
|
||
|
|
+++ b/src/lib-master/test-event-stats.c
|
||
|
|
@@ -344,7 +344,7 @@ static void test_no_merging2(void)
|
||
|
|
event_unref(&child_ev);
|
||
|
|
test_assert(
|
||
|
|
compare_test_stats_to(
|
||
|
|
- "EVENT %lu 1 0 0"
|
||
|
|
+ "EVENT %"PRIu64" 1 0 0"
|
||
|
|
" stest-event-stats.c %d"
|
||
|
|
" l0 0 ctest2\n", id, l));
|
||
|
|
test_end();
|
||
|
|
@@ -370,12 +370,12 @@ static void test_no_merging3(void)
|
||
|
|
event_unref(&child_ev);
|
||
|
|
test_assert(
|
||
|
|
compare_test_stats_to(
|
||
|
|
- "BEGIN %lu 0 1 0 0"
|
||
|
|
+ "BEGIN %"PRIu64" 0 1 0 0"
|
||
|
|
" stest-event-stats.c %d ctest1\n"
|
||
|
|
- "EVENT %lu 1 1 0"
|
||
|
|
+ "EVENT %"PRIu64" 1 1 0"
|
||
|
|
" stest-event-stats.c %d"
|
||
|
|
" l1 0 ctest2\n"
|
||
|
|
- "END\t%lu\n", idp, lp, idp, l, idp));
|
||
|
|
+ "END\t%"PRIu64"\n", idp, lp, idp, l, idp));
|
||
|
|
test_end();
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -435,7 +435,7 @@ static void test_merge_events2(void)
|
||
|
|
event_unref(&merge_ev2);
|
||
|
|
test_assert(
|
||
|
|
compare_test_stats_to(
|
||
|
|
- "EVENT %lu 1 0 0"
|
||
|
|
+ "EVENT %"PRIu64" 1 0 0"
|
||
|
|
" stest-event-stats.c %d l0 0"
|
||
|
|
" ctest3 ctest2 ctest1 Tkey3"
|
||
|
|
" 10 0 Ikey2 20"
|
||
|
|
@@ -467,11 +467,11 @@ static void test_skip_parents(void)
|
||
|
|
event_unref(&child_ev);
|
||
|
|
test_assert(
|
||
|
|
compare_test_stats_to(
|
||
|
|
- "BEGIN %lu 0 1 0 0"
|
||
|
|
+ "BEGIN %"PRIu64" 0 1 0 0"
|
||
|
|
" stest-event-stats.c %d ctest1\n"
|
||
|
|
- "EVENT %lu 1 3 0 "
|
||
|
|
+ "EVENT %"PRIu64" 1 3 0 "
|
||
|
|
"stest-event-stats.c %d l3 0"
|
||
|
|
- " ctest2\nEND\t%lu\n", id, lp, id, l, id));
|
||
|
|
+ " ctest2\nEND\t%"PRIu64"\n", id, lp, id, l, id));
|
||
|
|
test_end();
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -509,12 +509,12 @@ static void test_merge_events_skip_parents(void)
|
||
|
|
event_unref(&child2_ev);
|
||
|
|
test_assert(
|
||
|
|
compare_test_stats_to(
|
||
|
|
- "BEGIN %lu 0 1 0 0"
|
||
|
|
+ "BEGIN %"PRIu64" 0 1 0 0"
|
||
|
|
" stest-event-stats.c %d ctest1\n"
|
||
|
|
- "EVENT %lu 1 3 0 "
|
||
|
|
+ "EVENT %"PRIu64" 1 3 0 "
|
||
|
|
"stest-event-stats.c %d l3 0 "
|
||
|
|
"ctest4 ctest5 Tkey3 10 0 Skey4"
|
||
|
|
- " str4\nEND\t%lu\n", id, lp, id, l, id));
|
||
|
|
+ " str4\nEND\t%"PRIu64"\n", id, lp, id, l, id));
|
||
|
|
test_end();
|
||
|
|
}
|
||
|
|
|