+2016-12-31 Florian Weimer <fweimer@redhat.com>
+
+ * support/check.h (FAIL_RET, FAIL_EXIT, FAIL_EXIT1): Document that
+ test failures are recorded.
+ * support/check.c (support_print_failure_impl): Call
+ support_record_failure.
+ (support_exit_failure_impl): Call support_record_failure if status
+ indicates failure.
+ * support/delayed_exit.c (delayed_exit_thread): Use FAIL_EXIT1.
+ * support/xasprintf.c (xasprintf): Likewise.
+ * support/xfork.c (xfork): Likewise.
+ * support/xpthread_check_return.c (xpthread_check_return):
+ Likewise.
+ * support/xsocket.c (xsocket): Likeweise.
+ * support/xwaitpid.c (xwaitpid): Likewise.
+ * support/support_record_failure.c (struct test_failures): Adjust
+ to coding style.
+ * support/support_test_verify_impl.c (support_test_verify_impl):
+ Adjust error messages.
+ * support/tst-support_record_failure-2.sh (different_status):
+ Adjust error messages.
+
2016-12-31 Florian Weimer <fweimer@redhat.com>
* support/namespace.h: New file.
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <support/test-driver.h>
static void
print_failure (const char *file, int line, const char *format, va_list ap)
support_print_failure_impl (const char *file, int line,
const char *format, ...)
{
+ support_record_failure ();
va_list ap;
va_start (ap, format);
print_failure (file, line, format, ap);
support_exit_failure_impl (int status, const char *file, int line,
const char *format, ...)
{
+ if (status != EXIT_SUCCESS && status != EXIT_UNSUPPORTED)
+ support_record_failure ();
va_list ap;
va_start (ap, format);
print_failure (file, line, format, ap);
__BEGIN_DECLS
-/* Print failure message to standard output and return 1. */
+/* Record a test failure, print the failure message to standard output
+ and return 1. */
#define FAIL_RET(...) \
return support_print_failure_impl (__FILE__, __LINE__, __VA_ARGS__)
-/* Print failure message and terminate the process with STATUS. */
+/* Print the failure message and terminate the process with STATUS.
+ Record a the process as failed if STATUS is neither EXIT_SUCCESS
+ nor EXIT_UNSUPPORTED. */
#define FAIL_EXIT(status, ...) \
support_exit_failure_impl (status, __FILE__, __LINE__, __VA_ARGS__)
-/* Print failure message and terminate with exit status 1. */
+/* Record a test failure, print the failure message and terminate with
+ exit status 1. */
#define FAIL_EXIT1(...) \
support_exit_failure_impl (1, __FILE__, __LINE__, __VA_ARGS__)
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
+#include <support/check.h>
#include <time.h>
static void *
struct timespec delay = { seconds, 0 };
struct timespec remaining = { 0 };
if (nanosleep (&delay, &remaining) != 0)
- {
- printf ("error: nanosleep: %m\n");
- exit (1);
- }
+ FAIL_EXIT1 ("nanosleep: %m");
/* Exit the process sucessfully. */
exit (0);
return NULL;
propagate to the parent process. */
struct test_failures
{
- unsigned counter;
- unsigned failed;
+ unsigned int counter;
+ unsigned int failed;
};
static struct test_failures *state;
const char *expr)
{
support_record_failure ();
- printf ("FAIL %s:%d: not true: %s\n", file, line, expr);
+ printf ("error: %s:%d: not true: %s\n", file, line, expr);
if (status >= 0)
exit (status);
run_test 1 "error: 1 test failures" $direct --status=1
run_test 2 "error: 1 test failures" $direct --status=2
run_test 1 "error: 1 test failures" $direct --status=77
- run_test 2 "FAIL tst-support_record_failure.c:108: not true: false
+ run_test 2 "error: tst-support_record_failure.c:108: not true: false
error: 1 test failures" $direct --test-verify
}
different_status
different_status --direct
-run_test 1 "FAIL tst-support_record_failure.c:113: not true: false
+run_test 1 "error: tst-support_record_failure.c:113: not true: false
error: 1 test failures" --test-verify-exit
# --direct does not print the summary error message if exit is called.
-run_test 1 "FAIL tst-support_record_failure.c:113: not true: false" \
+run_test 1 "error: tst-support_record_failure.c:113: not true: false" \
--direct --test-verify-exit
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <support/check.h>
char *
xasprintf (const char *format, ...)
va_start (ap, format);
char *result;
if (vasprintf (&result, format, ap) < 0)
- {
- printf ("error: asprintf: %m\n");
- exit (1);
- }
+ FAIL_EXIT1 ("asprintf: %m");
va_end (ap);
return result;
}
#include <stdio.h>
#include <stdlib.h>
+#include <support/check.h>
pid_t
xfork (void)
{
pid_t result = fork ();
if (result < 0)
- {
- printf ("error: fork: %m\n");
- exit (1);
- }
+ FAIL_EXIT1 ("fork: %m");
return result;
}
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
+#include <support/check.h>
void
xpthread_check_return (const char *function, int value)
if (value != 0)
{
errno = value;
- printf ("error: %s: %m\n", function);
- exit (1);
+ FAIL_EXIT1 ("%s: %m", function);
}
}
{
int fd = socket (domain, type, protocol);
if (fd < 0)
- {
- support_record_failure ();
- printf ("error: socket (%d, %d, %d): %m\n", domain, type, protocol);
- exit (1);
- }
+ FAIL_EXIT1 ("socket (%d, %d, %d): %m\n", domain, type, protocol);
return fd;
}
#include <stdio.h>
#include <stdlib.h>
+#include <support/check.h>
#include <sys/wait.h>
int
{
pid_t result = waitpid (pid, status, flags);
if (result < 0)
- {
- printf ("error: waitpid: %m\n");
- exit (1);
- }
+ FAIL_EXIT1 ("waitpid: %m\n");
return result;
}