From 36cd739a78bb9af7f3bad138576ec453b67c66b0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 22 Jun 2018 19:01:21 +0200 Subject: [PATCH] test: shorten test-boot-timestamps a bit --- src/test/test-boot-timestamps.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c index 7e659f178d..a79e0cf16b 100644 --- a/src/test/test-boot-timestamps.c +++ b/src/test/test-boot-timestamps.c @@ -8,19 +8,15 @@ #include "util.h" static int test_acpi_fpdt(void) { - usec_t loader_start; - usec_t loader_exit; - char ts_start[FORMAT_TIMESPAN_MAX]; - char ts_exit[FORMAT_TIMESPAN_MAX]; - char ts_span[FORMAT_TIMESPAN_MAX]; + char ts_start[FORMAT_TIMESPAN_MAX], ts_exit[FORMAT_TIMESPAN_MAX], ts_span[FORMAT_TIMESPAN_MAX]; + usec_t loader_start, loader_exit; int r; r = acpi_get_boot_usec(&loader_start, &loader_exit); if (r < 0) { bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -ENODATA; - log_full_errno(ok ? LOG_DEBUG : LOG_ERR, - r, "Failed to read ACPI FPDT: %m"); + log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m"); return ok ? 0 : r; } @@ -32,19 +28,15 @@ static int test_acpi_fpdt(void) { } static int test_efi_loader(void) { - usec_t loader_start; - usec_t loader_exit; - char ts_start[FORMAT_TIMESPAN_MAX]; - char ts_exit[FORMAT_TIMESPAN_MAX]; - char ts_span[FORMAT_TIMESPAN_MAX]; + char ts_start[FORMAT_TIMESPAN_MAX], ts_exit[FORMAT_TIMESPAN_MAX], ts_span[FORMAT_TIMESPAN_MAX]; + usec_t loader_start, loader_exit; int r; r = efi_loader_get_boot_usec(&loader_start, &loader_exit); if (r < 0) { bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP; - log_full_errno(ok ? LOG_DEBUG : LOG_ERR, - r, "Failed to read EFI loader data: %m"); + log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read EFI loader data: %m"); return ok ? 0 : r; } @@ -57,8 +49,8 @@ static int test_efi_loader(void) { static int test_boot_timestamps(void) { char s[MAX(FORMAT_TIMESPAN_MAX, FORMAT_TIMESTAMP_MAX)]; - int r; dual_timestamp fw, l, k; + int r; dual_timestamp_from_monotonic(&k, 0); @@ -66,8 +58,7 @@ static int test_boot_timestamps(void) { if (r < 0) { bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP; - log_full_errno(ok ? LOG_DEBUG : LOG_ERR, - r, "Failed to read variables: %m"); + log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read variables: %m"); return ok ? 0 : r; }