rpms/dovecot
5
0
Fork 0
Code Issues Pull Requests Releases Activity

fix tests

Browse Source
This commit is contained in:
Michal Hlavinka 2019-01-09 17:46:45 +01:00
parent aa4c0451e3
commit d111f39fa0
2 changed files with 71 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
dovecot-2.3.4-de42b54.patch Normal file
View File

@ -0,0 +1,69 @@
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();
}

2
dovecot.spec
View File

@ -33,6 +33,7 @@ Patch6: dovecot-2.1.10-waitonline.patch
Patch8: dovecot-2.2.20-initbysystemd.patch Patch8: dovecot-2.2.20-initbysystemd.patch
Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch Patch9: dovecot-2.2.22-systemd_w_protectsystem.patch
Patch10: dovecot-2.3.0.1-libxcrypt.patch Patch10: dovecot-2.3.0.1-libxcrypt.patch
Patch11: dovecot-2.3.4-de42b54.patch
Source15: prestartscript Source15: prestartscript
@ -136,6 +137,7 @@ This package provides the development files for dovecot.
%patch8 -p1 -b .initbysystemd %patch8 -p1 -b .initbysystemd
%patch9 -p1 -b .systemd_w_protectsystem %patch9 -p1 -b .systemd_w_protectsystem
#%patch10 -p1 -b .libxcrypt #%patch10 -p1 -b .libxcrypt
%patch11 -p1 -b .de42b54
#pushd dovecot-2*3-pigeonhole-%{pigeonholever} #pushd dovecot-2*3-pigeonhole-%{pigeonholever}
#popd #popd