From 1b0a4de9fa73dd2453cbd2902c2cd4d000f4abe7 Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Sat, 2 Jan 2010 18:50:14 +0200 Subject: Add testcases for distribution tarball checking. * src/directive.c (run_check_script): Reword diagnostic messages. * tests/check-fail.at: New testcase. * tests/check-notify.at: New testcase. * tests/check-ok.at: New testcase. * tests/Makefile.am: Add new files. * tests/testsuite.at: Include new tests. * tests/atlocal.in (wydawca_init_testdirs): Create three source subdirectories. (wydawca_upload): Treat first argument as the name of a source subdirectory. * tests/etc/notify.rc: Add check-failure notification. * tests/etc/wydawca.rcin (ckfail, ckok): New spools. * tests/mailstats.at, tests/notify-upl.at, tests/upload.at: Update. * tests/upload-dry.at: Update output template. --- src/directive.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/directive.c b/src/directive.c index f648e07..3d70fa8 100644 --- a/src/directive.c +++ b/src/directive.c @@ -522,26 +522,26 @@ run_check_script (const char *script, struct file_triplet *trp, status = WEXITSTATUS (status); if (status) { - logmsg (LOG_ERR, "%s for triplet %s, spool %s returned %d", + logmsg (LOG_ERR, "%s for %s@%s returned %d", descr, trp->name, trp->spool->tag, status); return 1; } else if (debug_level > 2) - logmsg (LOG_DEBUG, "%s for triplet %s, spool %s returned %d", + logmsg (LOG_DEBUG, "%s for %s@%s returned %d", descr, trp->name, trp->spool->tag, status); } else if (WIFSIGNALED (status)) { int sig = WTERMSIG (status); logmsg (LOG_NOTICE, - "%s for triplet %s, spool %s terminated on signal %d", + "%s for %s@%s terminated on signal %d", descr, trp->name, trp->spool->tag, sig); return 1; } else { logmsg (LOG_NOTICE, - "%s for triplet %s, spool %s terminated with unhandled status", + "%s for %s@%s terminated with unhandled status", descr, trp->name, trp->spool->tag); return 1; } -- cgit v1.2.1