From 019911339bd270ea61de296d6532d000988ecaca Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 29 Jul 2019 16:11:29 +0200 Subject: [PATCH] commandtest: Remove commandhelper.log in test27 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The recently added test27 spawns commandhelper. This is fine, except, one of the things that commandhelper does is it records arguments it was spawn with into commandhelper.log. Other test cases then use checkoutput() to compare the arguments against the expected ones and also unlink() the log file. However, test27() is not doing that and thus it leaves the file behind. This breaks distcheck. Signed-off-by: Michal Privoznik Reviewed-by: Daniel P. Berrangé --- tests/commanddata/test27.log | 20 ++++++++++++++++++++ tests/commandtest.c | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 tests/commanddata/test27.log diff --git a/tests/commanddata/test27.log b/tests/commanddata/test27.log new file mode 100644 index 0000000000..40b2627c07 --- /dev/null +++ b/tests/commanddata/test27.log @@ -0,0 +1,20 @@ +ARG:--readfd +ARG:5 +ARG:--readfd +ARG:7 +ENV:DISPLAY=:0.0 +ENV:HOME=/home/test +ENV:HOSTNAME=test +ENV:LANG=C +ENV:LOGNAME=test +ENV:PATH=/usr/bin:/bin +ENV:TMPDIR=/tmp +ENV:USER=test +FD:0 +FD:1 +FD:2 +FD:5 +FD:7 +DAEMON:no +CWD:/tmp +UMASK:0022 diff --git a/tests/commandtest.c b/tests/commandtest.c index dfd15a2079..d7ab588969 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -1231,6 +1231,9 @@ static int test27(const void *unused ATTRIBUTE_UNUSED) goto cleanup; } + if (checkoutput("test27", NULL) < 0) + goto cleanup; + ret = 0; cleanup: -- GitLab