| Message ID | 20240207163812.3231697-8-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | maintainer updates for 9.0 pre-PR (docker, plugin tests, deprecation, elf, semihosting, gdbstub) | expand |
On Wed, Feb 7, 2024 at 9:38 AM Alex Bennée <alex.bennee@linaro.org> wrote: > From: Ilya Leoshkevich <iii@linux.ibm.com> > > Unlike on Linux, on FreeBSD renaming a file when the destination > already exists results in an IN_DELETE event for that existing file: > > $ FILEMONITOR_DEBUG=1 build/tests/unit/test-util-filemonitor > Rename /tmp/test-util-filemonitor-K13LI2/fish/one.txt -> > /tmp/test-util-filemonitor-K13LI2/two.txt > Event id=200000000 event=2 file=one.txt > Queue event id 200000000 event 2 file one.txt > Queue event id 100000000 event 2 file two.txt > Queue event id 100000002 event 2 file two.txt > Queue event id 100000000 event 0 file two.txt > Queue event id 100000002 event 0 file two.txt > Event id=100000000 event=0 file=two.txt > Expected event 0 but got 2 > > This difference in behavior is not expected to break the real users, so > teach the test to accept it. > Reviewed-by: Warner Losh <imp@bsdimp.com> Suggested-by: Daniel P. Berrange <berrange@redhat.com> > Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com> > Message-Id: <20240206002344.12372-4-iii@linux.ibm.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/unit/test-util-filemonitor.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tests/unit/test-util-filemonitor.c > b/tests/unit/test-util-filemonitor.c > index a22de275955..02e67fc96ac 100644 > --- a/tests/unit/test-util-filemonitor.c > +++ b/tests/unit/test-util-filemonitor.c > @@ -360,6 +360,14 @@ test_file_monitor_events(void) > { .type = QFILE_MONITOR_TEST_OP_EVENT, > .filesrc = "one.txt", .watchid = &watch4, > .eventid = QFILE_MONITOR_EVENT_DELETED }, > +#ifdef __FreeBSD__ > + { .type = QFILE_MONITOR_TEST_OP_EVENT, > + .filesrc = "two.txt", .watchid = &watch0, > + .eventid = QFILE_MONITOR_EVENT_DELETED }, > + { .type = QFILE_MONITOR_TEST_OP_EVENT, > + .filesrc = "two.txt", .watchid = &watch2, > + .eventid = QFILE_MONITOR_EVENT_DELETED }, > +#endif > { .type = QFILE_MONITOR_TEST_OP_EVENT, > .filesrc = "two.txt", .watchid = &watch0, > .eventid = QFILE_MONITOR_EVENT_CREATED }, > -- > 2.39.2 > >
diff --git a/tests/unit/test-util-filemonitor.c b/tests/unit/test-util-filemonitor.c index a22de275955..02e67fc96ac 100644 --- a/tests/unit/test-util-filemonitor.c +++ b/tests/unit/test-util-filemonitor.c @@ -360,6 +360,14 @@ test_file_monitor_events(void) { .type = QFILE_MONITOR_TEST_OP_EVENT, .filesrc = "one.txt", .watchid = &watch4, .eventid = QFILE_MONITOR_EVENT_DELETED }, +#ifdef __FreeBSD__ + { .type = QFILE_MONITOR_TEST_OP_EVENT, + .filesrc = "two.txt", .watchid = &watch0, + .eventid = QFILE_MONITOR_EVENT_DELETED }, + { .type = QFILE_MONITOR_TEST_OP_EVENT, + .filesrc = "two.txt", .watchid = &watch2, + .eventid = QFILE_MONITOR_EVENT_DELETED }, +#endif { .type = QFILE_MONITOR_TEST_OP_EVENT, .filesrc = "two.txt", .watchid = &watch0, .eventid = QFILE_MONITOR_EVENT_CREATED },