X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-unit-file.c;fp=src%2Ftest%2Ftest-unit-file.c;h=d6a7d439150be1e0c4168f0447c7bb7ac1367ae1;hp=6a146a702f85690ad5643bfd2b96219295d794bc;hb=4d8629de8bd0f837f99981267d10e71d1f72e47d;hpb=17a1c597c5f9be1c25431a764155cd50c0d074b7 diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index 6a146a702..d6a7d4391 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -73,15 +73,20 @@ static void check_execcommand(ExecCommand *c, const char* argv1, const char* argv2, bool ignore) { + size_t n; + assert_se(c); log_info("expect: \"%s\" [\"%s\" \"%s\" \"%s\"]", path, argv0 ?: path, argv1, argv2); + n = strv_length(c->argv); log_info("actual: \"%s\" [\"%s\" \"%s\" \"%s\"]", - c->path, c->argv[0], c->argv[1], c->argv[2]); + c->path, c->argv[0], n > 0 ? c->argv[1] : NULL, n > 1 ? c->argv[2] : NULL); assert_se(streq(c->path, path)); assert_se(streq(c->argv[0], argv0 ?: path)); - assert_se(streq_ptr(c->argv[1], argv1)); - assert_se(streq_ptr(c->argv[2], argv2)); + if (n > 0) + assert_se(streq_ptr(c->argv[1], argv1)); + if (n > 1) + assert_se(streq_ptr(c->argv[2], argv2)); assert_se(c->ignore == ignore); }