----- Original Message -----
> From: "Andrey Vagin" <ava...@parallels.com>
> To: ltp-list@lists.sourceforge.net
> Cc: "Jan Stancek" <jstan...@redhat.com>, "Andrey Vagin" <ava...@parallels.com>
> Sent: Thursday, 11 September, 2014 4:18:12 PM
> Subject: [PATCH 2/2] inotify: print event->name accoding with event->len (v2)
>
> v2: event_set[test_num].name is a null terminated string
> Signed-off-by: Andrey Vagin <ava...@parallels.com>
> ---
> testcases/kernel/syscalls/inotify/inotify02.c | 8 ++++----
> testcases/kernel/syscalls/inotify/inotify04.c | 16 ++++++++--------
> 2 files changed, 12 insertions(+), 12 deletions(-)
Both pushed, with small change to drop "len" also from inotify02.
Regards,
Jan
>
> diff --git a/testcases/kernel/syscalls/inotify/inotify02.c
> b/testcases/kernel/syscalls/inotify/inotify02.c
> index f4f93fc..69bc0ff 100644
> --- a/testcases/kernel/syscalls/inotify/inotify02.c
> +++ b/testcases/kernel/syscalls/inotify/inotify02.c
> @@ -216,8 +216,8 @@ int main(int ac, char **av)
> tst_resm(TFAIL,
> "get unnecessary event: "
> "wd=%d mask=%x cookie=%u len=%u"
> - "name=\"%s\"", event->wd, event->mask,
> - event->cookie, event->len,
> + "name=\"%.*s\"", event->wd,
> event->mask,
> + event->cookie, event->len, event->len,
> event->name);
>
> } else if ((event_set[test_num].mask == event->mask)
> @@ -244,10 +244,10 @@ int main(int ac, char **av)
> if (!fail) {
> tst_resm(TPASS,
> "get event: wd=%d mask=%x "
> - "cookie=%u len=%u name=\"%s\"",
> + "cookie=%u len=%u
> name=\"%.*s\"",
> event->wd, event->mask,
> event->cookie, event->len,
> - event->name);
> + event->len, event->name);
> } else {
> tst_resm(TFAIL,
> "get event: wd=%d mask=%x "
> diff --git a/testcases/kernel/syscalls/inotify/inotify04.c
> b/testcases/kernel/syscalls/inotify/inotify04.c
> index 7c3fdef..9eb3b3c 100644
> --- a/testcases/kernel/syscalls/inotify/inotify04.c
> +++ b/testcases/kernel/syscalls/inotify/inotify04.c
> @@ -67,7 +67,6 @@ int TST_TOTAL = 4;
> struct event_t {
> char name[BUF_SIZE];
> unsigned int mask;
> - unsigned int len;
> };
>
> #define TEST_DIR "test_dir"
> @@ -223,8 +222,8 @@ int main(int argc, char **argv)
> tst_resm(TFAIL,
> "got unnecessary event: "
> "wd=%d mask=%x cookie=%u len=%u "
> - "name=\"%s\"", event->wd, event->mask,
> - event->cookie, event->len, event->name);
> + "name=\"%.*s\"", event->wd, event->mask,
> + event->cookie, event->len, event->len,
> event->name);
>
> } else if ((event_set[test_num].mask == event->mask)
> &&
> @@ -233,19 +232,20 @@ int main(int argc, char **argv)
> event->len))) {
> tst_resm(TPASS,
> "got event: wd=%d mask=%x "
> - "cookie=%u len=%u name=\"%s\"",
> + "cookie=%u len=%u name=\"%.*s\"",
> event->wd, event->mask, event->cookie,
> - event->len, event->name);
> + event->len, event->len, event->name);
>
> } else {
> tst_resm(TFAIL, "got event: wd=%d mask=%x "
> "(expected %x) cookie=%u len=%u "
> - "name=\"%s\" (expected \"%s\") %d",
> + "name=\"%.*s\" (expected \"%s\") %d",
> event->wd, event->mask,
> event_set[test_num].mask,
> - event->cookie, event->len, event->name,
> + event->cookie, event->len,
> + event->len, event->name,
> event_set[test_num].name,
> - strcmp(event_set[test_num].name, event->name));
> + strncmp(event_set[test_num].name, event->name,
> event->len));
> }
> test_num++;
> i += EVENT_SIZE + event->len;
> --
> 1.9.3
>
>
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
