shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-08 09:57:41 +03:00
Code

test: shorten test-boot-timestamps a bit

Browse Source
This commit is contained in:
Lennart Poettering 2018-06-22 19:01:21 +02:00
parent e78c250b00
commit 36cd739a78
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/test/test-boot-timestamps.c
View File

@ -8,19 +8,15 @@
#include "util.h" #include "util.h"
static int test_acpi_fpdt(void) { static int test_acpi_fpdt(void) {
usec_t loader_start; char ts_start[FORMAT_TIMESPAN_MAX], ts_exit[FORMAT_TIMESPAN_MAX], ts_span[FORMAT_TIMESPAN_MAX];
usec_t loader_exit; usec_t loader_start, loader_exit;
char ts_start[FORMAT_TIMESPAN_MAX];
char ts_exit[FORMAT_TIMESPAN_MAX];
char ts_span[FORMAT_TIMESPAN_MAX];
int r; int r;
r = acpi_get_boot_usec(&loader_start, &loader_exit); r = acpi_get_boot_usec(&loader_start, &loader_exit);
if (r < 0) { if (r < 0) {
bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -ENODATA; bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -ENODATA;
log_full_errno(ok ? LOG_DEBUG : LOG_ERR, log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m");
r, "Failed to read ACPI FPDT: %m");
return ok ? 0 : r; return ok ? 0 : r;
} }
@ -32,19 +28,15 @@ static int test_acpi_fpdt(void) {
} }
static int test_efi_loader(void) { static int test_efi_loader(void) {
usec_t loader_start; char ts_start[FORMAT_TIMESPAN_MAX], ts_exit[FORMAT_TIMESPAN_MAX], ts_span[FORMAT_TIMESPAN_MAX];
usec_t loader_exit; usec_t loader_start, loader_exit;
char ts_start[FORMAT_TIMESPAN_MAX];
char ts_exit[FORMAT_TIMESPAN_MAX];
char ts_span[FORMAT_TIMESPAN_MAX];
int r; int r;
r = efi_loader_get_boot_usec(&loader_start, &loader_exit); r = efi_loader_get_boot_usec(&loader_start, &loader_exit);
if (r < 0) { if (r < 0) {
bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP; bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
log_full_errno(ok ? LOG_DEBUG : LOG_ERR, log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read EFI loader data: %m");
r, "Failed to read EFI loader data: %m");
return ok ? 0 : r; return ok ? 0 : r;
} }
@ -57,8 +49,8 @@ static int test_efi_loader(void) {
static int test_boot_timestamps(void) { static int test_boot_timestamps(void) {
char s[MAX(FORMAT_TIMESPAN_MAX, FORMAT_TIMESTAMP_MAX)]; char s[MAX(FORMAT_TIMESPAN_MAX, FORMAT_TIMESTAMP_MAX)];
int r;
dual_timestamp fw, l, k; dual_timestamp fw, l, k;
int r;
dual_timestamp_from_monotonic(&k, 0); dual_timestamp_from_monotonic(&k, 0);
@ -66,8 +58,7 @@ static int test_boot_timestamps(void) {
if (r < 0) { if (r < 0) {
bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP; bool ok = r == -ENOENT || (getuid() != 0 && r == -EACCES) || r == -EOPNOTSUPP;
log_full_errno(ok ? LOG_DEBUG : LOG_ERR, log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read variables: %m");
r, "Failed to read variables: %m");
return ok ? 0 : r; return ok ? 0 : r;
} }