shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-22 13:33:56 +03:00
Code

tests: use a helper function to parse environment and open logging

Browse Source 
The advantages are that we save a few lines, and that we can override
logging using environment variables in more test executables.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-09-13 14:31:13 +02:00
parent 8b81c382c3
commit 6d7c403324
85 changed files with 153 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/fuzz/fuzz-main.c
View File

@ -4,6 +4,7 @@
#include "log.h"
#include "fileio.h"
#include "fuzz.h"
#include "tests.h"
/* This is a test driver for the systemd fuzzers that provides main function
* for regression testing outside of oss-fuzz (https://github.com/google/oss-fuzz)
@ -16,9 +17,7 @@ int main(int argc, char **argv) {
size_t size;
char *name;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
for (i = 1; i < argc; i++) {
_cleanup_free_ char *buf = NULL;

4
src/journal/test-catalog.c
View File

@ -206,9 +206,7 @@ int main(int argc, char *argv[]) {
setlocale(LC_ALL, "de_DE.UTF-8");
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
/* If test-catalog is located at the build directory, then use catalogs in that.
* If it is not, e.g. installed by systemd-tests package, then use installed catalogs. */

7
src/journal/test-compress-benchmark.c
View File

@ -143,11 +143,7 @@ static void test_compress_decompress(const char* label, const char* type,
int main(int argc, char *argv[]) {
#if HAVE_XZ || HAVE_LZ4
const char *i;
log_set_max_level(LOG_INFO);
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
if (argc >= 2) {
unsigned x;
@ -163,6 +159,7 @@ int main(int argc, char *argv[]) {
else
arg_start = getpid_cached();
const char *i;
NULSTR_FOREACH(i, "zeros\0simple\0random\0") {
#if HAVE_XZ
test_compress_decompress("XZ", i, compress_blob_xz, decompress_blob_xz);

3
src/journal/test-compress.c
View File

@ -12,6 +12,7 @@
#include "macro.h"
#include "path-util.h"
#include "random-util.h"
#include "tests.h"
#include "util.h"
#if HAVE_XZ
@ -253,7 +254,7 @@ int main(int argc, char *argv[]) {
memcpy(huge, "HUGE=", 5);
char_array_0(huge);
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
random_bytes(data + 7, sizeof(data) - 7);

3
src/journal/test-journal-enum.c
View File

@ -7,12 +7,13 @@
#include "journal-internal.h"
#include "log.h"
#include "macro.h"
#include "tests.h"
int main(int argc, char *argv[]) {
unsigned n = 0;
_cleanup_(sd_journal_closep) sd_journal*j = NULL;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(sd_journal_open(&j, SD_JOURNAL_LOCAL_ONLY) >= 0);

3
src/journal/test-journal-init.c
View File

@ -5,6 +5,7 @@
#include "log.h"
#include "parse-util.h"
#include "rm-rf.h"
#include "tests.h"
#include "util.h"
int main(int argc, char *argv[]) {
@ -12,7 +13,7 @@ int main(int argc, char *argv[]) {
int r, i, I = 100;
char t[] = "/tmp/journal-stream-XXXXXX";
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
if (argc >= 2) {
r = safe_atoi(argv[1], &I);

2
src/journal/test-journal-interleaving.c
View File

@ -274,7 +274,7 @@ static void test_sequence_numbers(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
/* journal_file_open requires a valid machine id */
if (access("/etc/machine-id", F_OK) != 0)

3
src/journal/test-journal-match.c
View File

@ -8,13 +8,14 @@
#include "journal-internal.h"
#include "log.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
int main(int argc, char *argv[]) {
_cleanup_(sd_journal_closep) sd_journal*j = NULL;
_cleanup_free_ char *t;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(sd_journal_open(&j, 0) >= 0);

2
src/journal/test-journal-stream.c
View File

@ -71,7 +71,7 @@ int main(int argc, char *argv[]) {
if (access("/etc/machine-id", F_OK) != 0)
return log_tests_skipped("/etc/machine-id not found");
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);

2
src/journal/test-journal-verify.c
View File

@ -65,7 +65,7 @@ int main(int argc, char *argv[]) {
if (access("/etc/machine-id", F_OK) != 0)
return log_tests_skipped("/etc/machine-id not found");
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);

8
src/journal/test-journal.c
View File

@ -22,7 +22,7 @@ static void test_non_empty(void) {
sd_id128_t fake_boot_id;
char t[] = "/tmp/journal-XXXXXX";
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);
@ -113,7 +113,7 @@ static void test_empty(void) {
JournalFile *f1, *f2, *f3, *f4;
char t[] = "/tmp/journal-XXXXXX";
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);
@ -165,7 +165,7 @@ static bool check_compressed(uint64_t compress_threshold, uint64_t data_size) {
assert_se(data_size <= sizeof(data));
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(t));
assert_se(chdir(t) >= 0);
@ -239,6 +239,8 @@ static void test_min_compress_size(void) {
int main(int argc, char *argv[]) {
arg_keep = argc > 1;
test_setup_logging(LOG_INFO);
/* journal_file_open requires a valid machine id */
if (access("/etc/machine-id", F_OK) != 0)
return log_tests_skipped("/etc/machine-id not found");

5
src/libsystemd-network/test-acd.c
View File

@ -13,6 +13,7 @@
#include "in-addr-util.h"
#include "netlink-util.h"
#include "tests.h"
#include "util.h"
static void acd_handler(sd_ipv4acd *acd, int event, void *userdata) {
@ -83,9 +84,7 @@ static int test_acd(const char *ifname, const char *address) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
if (argc == 3)
return test_acd(argv[1], argv[2]);

5
src/libsystemd-network/test-dhcp-client.c
View File

@ -16,6 +16,7 @@
#include "dhcp-internal.h"
#include "dhcp-protocol.h"
#include "fd-util.h"
#include "tests.h"
#include "util.h"
static uint8_t mac_addr[] = {'A', 'B', 'C', '1', '2', '3'};
@ -524,9 +525,7 @@ static void test_addr_acq(sd_event *e) {
int main(int argc, char *argv[]) {
_cleanup_(sd_event_unrefp) sd_event *e;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
assert_se(sd_event_new(&e) >= 0);

4
src/libsystemd-network/test-dhcp-server.c
View File

@ -229,9 +229,7 @@ int main(int argc, char *argv[]) {
_cleanup_(sd_event_unrefp) sd_event *e;
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
assert_se(sd_event_new(&e) >= 0);

5
src/libsystemd-network/test-dhcp6-client.c
View File

@ -19,6 +19,7 @@
#include "fd-util.h"
#include "macro.h"
#include "socket-util.h"
#include "tests.h"
#include "virt.h"
static struct ether_addr mac_addr = {
@ -910,9 +911,7 @@ int main(int argc, char *argv[]) {
assert_se(sd_event_new(&e) >= 0);
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_client_basic(e);
test_option(e);

5
src/libsystemd-network/test-ipv4ll-manual.c
View File

@ -15,6 +15,7 @@
#include "netlink-util.h"
#include "parse-util.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
static void ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
@ -95,9 +96,7 @@ static int test_ll(const char *ifname, const char *seed) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
if (argc == 2)
return test_ll(argv[1], NULL);

5
src/libsystemd-network/test-ipv4ll.c
View File

@ -15,6 +15,7 @@
#include "arp-util.h"
#include "fd-util.h"
#include "socket-util.h"
#include "tests.h"
#include "util.h"
static bool verbose = false;
@ -193,9 +194,7 @@ static void test_basic_request(sd_event *e) {
int main(int argc, char *argv[]) {
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
assert_se(sd_event_new(&e) >= 0);

5
src/libsystemd-network/test-ndisc-ra.c
View File

@ -13,6 +13,7 @@
#include "icmp6-util.h"
#include "socket-util.h"
#include "strv.h"
#include "tests.h"
static struct ether_addr mac_addr = {
.ether_addr_octet = { 0x78, 0x2b, 0xcb, 0xb3, 0x6d, 0x53 }
@ -357,9 +358,7 @@ static void test_ra(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_radv_prefix();
test_radv();

5
src/libsystemd-network/test-ndisc-rs.c
View File

@ -14,6 +14,7 @@
#include "socket-util.h"
#include "strv.h"
#include "ndisc-internal.h"
#include "tests.h"
static struct ether_addr mac_addr = {
.ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}
@ -407,9 +408,7 @@ static void test_timeout(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_rs();
test_timeout();

2
src/libsystemd/sd-bus/test-bus-chat.c
View File

@ -510,6 +510,8 @@ int main(int argc, char *argv[]) {
void *p;
int q, r;
test_setup_logging(LOG_INFO);
r = server_init(&bus);
if (r < 0)
return log_tests_skipped("Failed to connect to bus");

3
src/libsystemd/sd-bus/test-bus-cleanup.c
View File

@ -60,8 +60,7 @@ static void test_bus_new_signal(void) {
}
int main(int argc, char **argv) {
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
test_bus_new();

4
src/libsystemd/sd-bus/test-bus-creds.c
View File

@ -11,9 +11,7 @@ int main(int argc, char *argv[]) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
if (cg_unified_flush() == -ENOMEDIUM)
return log_tests_skipped("/sys/fs/cgroup/ not available");

2
src/libsystemd/sd-bus/test-bus-gvariant.c
View File

@ -13,6 +13,7 @@
#include "bus-message.h"
#include "bus-util.h"
#include "macro.h"
#include "tests.h"
#include "util.h"
static void test_bus_gvariant_is_fixed_size(void) {
@ -199,6 +200,7 @@ static void test_marshal(void) {
}
int main(int argc, char *argv[]) {
test_setup_logging(LOG_INFO);
test_bus_gvariant_is_fixed_size();
test_bus_gvariant_get_size();

2
src/libsystemd/sd-bus/test-bus-marshal.c
View File

@ -121,6 +121,8 @@ int main(int argc, char *argv[]) {
double dbl;
uint64_t u64;
test_setup_logging(LOG_INFO);
r = sd_bus_default_user(&bus);
if (r < 0)
return log_tests_skipped("Failed to connect to bus");

2
src/libsystemd/sd-bus/test-bus-match.c
View File

@ -78,6 +78,8 @@ int main(int argc, char *argv[]) {
sd_bus_slot slots[19];
int r;
test_setup_logging(LOG_INFO);
r = sd_bus_open_user(&bus);
if (r < 0)
return log_tests_skipped("Failed to connect to bus");

2
src/libsystemd/sd-bus/test-bus-track.c
View File

@ -48,6 +48,8 @@ int main(int argc, char *argv[]) {
const char *unique;
int r;
test_setup_logging(LOG_INFO);
r = sd_event_default(&event);
assert_se(r >= 0);

5
src/libsystemd/sd-event/test-event.c
View File

@ -16,6 +16,7 @@
#include "signal-util.h"
#include "stdio-util.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
static int prepare_handler(sd_event_source *s, void *userdata) {
@ -481,9 +482,7 @@ static void test_inotify(unsigned n_create_events) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
test_basic();
test_sd_event_now();

5
src/libsystemd/sd-netlink/test-local-addresses.c
View File

@ -4,6 +4,7 @@
#include "alloc-util.h"
#include "in-addr-util.h"
#include "local-addresses.h"
#include "tests.h"
static void print_local_addresses(struct local_address *a, unsigned n) {
unsigned i;
@ -20,9 +21,7 @@ int main(int argc, char *argv[]) {
struct local_address *a;
int n;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
a = NULL;
n = local_addresses(NULL, 0, AF_UNSPEC, &a);

2
src/network/test-network.c
View File

@ -224,6 +224,8 @@ int main(void) {
_cleanup_(sd_device_unrefp) sd_device *loopback = NULL;
int ifindex, r;
test_setup_logging(LOG_INFO);
test_deserialize_in_addr();
test_deserialize_dhcp_routes();
test_address_equality();

5
src/network/test-routing-policy-rule.c
View File

@ -9,6 +9,7 @@
#include "network-internal.h"
#include "networkd-manager.h"
#include "string-util.h"
#include "tests.h"
static void test_rule_serialization(const char *title, const char *ruleset, const char *expected) {
char pattern[] = "/tmp/systemd-test-routing-policy-rule.XXXXXX",
@ -57,9 +58,7 @@ static void test_rule_serialization(const char *title, const char *ruleset, cons
int main(int argc, char **argv) {
_cleanup_free_ char *p = NULL;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_rule_serialization("basic parsing",
"RULE=from=1.2.3.4/32 to=2.3.4.5/32 tos=5 fwmark=1/2 table=10", NULL);

5
src/nspawn/test-patch-uid.c
View File

@ -5,15 +5,14 @@
#include "log.h"
#include "nspawn-patch-uid.h"
#include "user-util.h"
#include "tests.h"
#include "util.h"
int main(int argc, char *argv[]) {
uid_t shift, range;
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
if (argc != 4) {
log_error("Expected PATH SHIFT RANGE parameters.");

6
src/shared/tests.c
View File

@ -91,6 +91,12 @@ bool slow_tests_enabled(void) {
return SYSTEMD_SLOW_TESTS_DEFAULT;
}
void test_setup_logging(int level) {
log_set_max_level(level);
log_parse_environment();
log_open();
}
int log_tests_skipped(const char *message) {
log_notice("%s: %s, skipping tests.",
program_invocation_short_name, message);

1
src/shared/tests.h
View File

@ -5,4 +5,5 @@ char* setup_fake_runtime_dir(void);
const char* get_testdata_dir(void);
const char* get_catalog_dir(void);
bool slow_tests_enabled(void);
void test_setup_logging(int level);
int log_tests_skipped(const char *message);

2
src/test/test-architecture.c
View File

@ -10,6 +10,8 @@ int main(int argc, char *argv[]) {
int a, v;
const char *p;
test_setup_logging(LOG_INFO);
assert_se(architecture_from_string("") < 0);
assert_se(architecture_from_string(NULL) < 0);
assert_se(architecture_from_string("hoge") < 0);

4
src/test/test-barrier.c
View File

@ -420,9 +420,7 @@ TEST_BARRIER(test_barrier_pending_exit,
TEST_BARRIER_WAIT_SUCCESS(pid2));
int main(int argc, char *argv[]) {
log_set_max_level(LOG_INFO);
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
if (!slow_tests_enabled())
return log_tests_skipped("slow tests are disabled");

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

@ -82,8 +82,7 @@ static int test_boot_timestamps(void) {
int main(int argc, char* argv[]) {
int p, q, r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
p = test_acpi_fpdt();
assert(p >= 0);

4
src/test/test-bpf.c
View File

@ -28,9 +28,7 @@ int main(int argc, char *argv[]) {
char log_buf[65535];
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
r = enter_cgroup_subroot();
if (r == -ENOMEDIUM)

5
src/test/test-bus-util.c
View File

@ -2,6 +2,7 @@
#include "bus-util.h"
#include "log.h"
#include "tests.h"
static void test_name_async(unsigned n_messages) {
_cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
@ -78,9 +79,7 @@ static void test_destroy_callback(void) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_name_async(0);
test_name_async(20);

5
src/test/test-capability.c
View File

@ -220,12 +220,11 @@ static void test_set_ambient_caps(void) {
int main(int argc, char *argv[]) {
bool run_ambient;
test_setup_logging(LOG_INFO);
test_last_cap_file();
test_last_cap_probe();
log_parse_environment();
log_open();
log_info("have ambient caps: %s", yes_no(ambient_capabilities_supported()));
if (getuid() != 0)

3
src/test/test-cgroup-mask.c
View File

@ -118,8 +118,7 @@ static void test_cg_mask_to_string(void) {
int main(int argc, char* argv[]) {
int rc = EXIT_SUCCESS;
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_cg_mask_to_string();
TEST_REQ_RUNNING_SYSTEMD(rc = test_cgroup_mask());

5
src/test/test-cgroup-util.c
View File

@ -14,6 +14,7 @@
#include "string-util.h"
#include "strv.h"
#include "test-helper.h"
#include "tests.h"
#include "user-util.h"
#include "util.h"
@ -447,9 +448,7 @@ static void test_cg_get_keyed_attribute(void) {
}
int main(void) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_path_decode_unit();
test_path_get_unit();

5
src/test/test-condition.c
View File

@ -26,6 +26,7 @@
#include "strv.h"
#include "tomoyo-util.h"
#include "user-util.h"
#include "tests.h"
#include "util.h"
#include "virt.h"
@ -673,9 +674,7 @@ static void test_condition_test_group(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_condition_test_path();
test_condition_test_ac_power();

5
src/test/test-conf-files.c
View File

@ -16,6 +16,7 @@
#include "rm-rf.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#include "user-util.h"
#include "util.h"
@ -93,9 +94,7 @@ static void test_conf_files_list(bool use_root) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_conf_files_list(false);
test_conf_files_list(true);

3
src/test/test-copy.c
View File

@ -14,6 +14,7 @@
#include "rm-rf.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#include "user-util.h"
#include "util.h"
@ -254,7 +255,7 @@ static void test_copy_atomic(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_copy_file();
test_copy_file_fd();

5
src/test/test-date.c
View File

@ -4,6 +4,7 @@
#include "alloc-util.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
static void test_should_pass(const char *p) {
@ -66,9 +67,7 @@ static void test_one_noutc(const char *p) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_one("17:41");
test_one("18:42:44");

3
src/test/test-dissect-image.c
View File

@ -7,13 +7,14 @@
#include "log.h"
#include "loop-util.h"
#include "string-util.h"
#include "tests.h"
int main(int argc, char *argv[]) {
_cleanup_(loop_device_unrefp) LoopDevice *d = NULL;
_cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
int r, i;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
if (argc < 2) {
log_error("Requires one command line argument.");

5
src/test/test-dns-domain.c
View File

@ -4,6 +4,7 @@
#include "dns-domain.h"
#include "macro.h"
#include "string-util.h"
#include "tests.h"
static void test_dns_label_unescape_one(const char *what, const char *expect, size_t buffer_sz, int ret) {
char buffer[buffer_sz];
@ -687,9 +688,7 @@ static void test_dns_name_is_valid_or_address(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_dns_label_unescape();
test_dns_label_unescape_suffix();

4
src/test/test-engine.c
View File

@ -18,9 +18,7 @@ int main(int argc, char *argv[]) {
Job *j;
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
r = enter_cgroup_subroot();
if (r == -ENOMEDIUM)

5
src/test/test-escape.c
View File

@ -3,6 +3,7 @@
#include "alloc-util.h"
#include "escape.h"
#include "macro.h"
#include "tests.h"
static void test_cescape(void) {
_cleanup_free_ char *escaped;
@ -119,9 +120,7 @@ static void test_shell_maybe_quote(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_cescape();
test_cunescape();

5
src/test/test-exec-util.c
View File

@ -19,6 +19,7 @@
#include "rm-rf.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
static int here = 0, here2 = 0, here3 = 0;
void *ignore_stdout_args[] = {&here, &here2, &here3};
@ -334,9 +335,7 @@ static void test_environment_gathering(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_execute_directory(true);
test_execute_directory(false);

4
src/test/test-execute.c
View File

@ -724,9 +724,7 @@ int main(int argc, char *argv[]) {
};
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
(void) unsetenv("USER");
(void) unsetenv("LOGNAME");

3
src/test/test-fd-util.c
View File

@ -12,6 +12,7 @@
#include "random-util.h"
#include "string-util.h"
#include "util.h"
#include "tests.h"
static void test_close_many(void) {
int fds[3];
@ -316,7 +317,7 @@ static void test_read_nr_open(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_close_many();
test_close_nointr();

5
src/test/test-fileio.c
View File

@ -16,6 +16,7 @@
#include "process-util.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#include "util.h"
static void test_parse_env_file(void) {
@ -710,9 +711,7 @@ static void test_read_line3(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_parse_env_file();
test_parse_multiline_env_file();

3
src/test/test-firewall-util.c
View File

@ -2,12 +2,13 @@
#include "firewall-util.h"
#include "log.h"
#include "tests.h"
#define MAKE_IN_ADDR_UNION(a,b,c,d) (union in_addr_union) { .in.s_addr = htobe32((uint32_t) (a) << 24 | (uint32_t) (b) << 16 | (uint32_t) (c) << 8 | (uint32_t) (d))}
int main(int argc, char *argv[]) {
int r;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
r = fw_add_masquerade(true, AF_INET, 0, NULL, 0, "foobar", NULL, 0);
if (r < 0)

2
src/test/test-hash.c
View File

@ -14,7 +14,7 @@ int main(int argc, char *argv[]) {
_cleanup_free_ char *s = NULL;
int r;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(khash_new(&h, NULL) == -EINVAL);
assert_se(khash_new(&h, "") == -EINVAL);

3
src/test/test-install-root.c
View File

@ -7,6 +7,7 @@
#include "rm-rf.h"
#include "special.h"
#include "string-util.h"
#include "tests.h"
static void test_basic_mask_and_enable(const char *root) {
const char *p;
@ -14,7 +15,7 @@ static void test_basic_mask_and_enable(const char *root) {
UnitFileChange *changes = NULL;
size_t n_changes = 0;
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "a.service", NULL) == -ENOENT);
assert_se(unit_file_get_state(UNIT_FILE_SYSTEM, root, "b.service", NULL) == -ENOENT);

4
src/test/test-install.c
View File

@ -4,6 +4,7 @@
#include <string.h>
#include "install.h"
#include "tests.h"
static void dump_changes(UnitFileChange *c, unsigned n) {
unsigned i;
@ -29,8 +30,7 @@ int main(int argc, char* argv[]) {
size_t n_changes = 0;
UnitFileState state = 0;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
h = hashmap_new(&string_hash_ops);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h, NULL, NULL);

2
src/test/test-ipcrm.c
View File

@ -10,6 +10,8 @@ int main(int argc, char *argv[]) {
int r;
const char* name = argv[1] ?: NOBODY_USER_NAME;
test_setup_logging(LOG_INFO);
r = get_user_creds(&name, &uid, NULL, NULL, NULL, 0);
if (r == -ESRCH)
return log_tests_skipped("Failed to resolve user");

3
src/test/test-journal-importer.c
View File

@ -69,8 +69,7 @@ static void test_bad_input(void) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
test_basic_parsing();
test_bad_input();

5
src/test/test-loopback.c
View File

@ -5,13 +5,12 @@
#include "log.h"
#include "loopback-setup.h"
#include "tests.h"
int main(int argc, char* argv[]) {
int r;
log_open();
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
r = loopback_setup();
if (r < 0)

3
src/test/test-mount-util.c
View File

@ -13,6 +13,7 @@
#include "path-util.h"
#include "rm-rf.h"
#include "string-util.h"
#include "tests.h"
static void test_mount_propagation_flags(const char *name, int ret, unsigned long expected) {
long unsigned flags;
@ -295,7 +296,7 @@ static void test_mount_option_mangle(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_mount_propagation_flags("shared", 0, MS_SHARED);
test_mount_propagation_flags("slave", 0, MS_SLAVE);

3
src/test/test-namespace.c
View File

@ -109,8 +109,7 @@ int main(int argc, char *argv[]) {
char boot_id[SD_ID128_STRING_MAX];
_cleanup_free_ char *x = NULL, *y = NULL, *z = NULL, *zz = NULL;
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
assert_se(sd_id128_get_boot(&bid) >= 0);
sd_id128_to_string(bid, boot_id);

2
src/test/test-netlink-manual.c
View File

@ -118,6 +118,8 @@ int main(int argc, char *argv[]) {
sd_netlink *rtnl;
int r;
test_setup_logging(LOG_INFO);
assert_se(sd_netlink_open(&rtnl) >= 0);
assert_se(rtnl);

3
src/test/test-ns.c
View File

@ -6,6 +6,7 @@
#include "log.h"
#include "namespace.h"
#include "tests.h"
int main(int argc, char *argv[]) {
const char * const writable[] = {
@ -43,7 +44,7 @@ int main(int argc, char *argv[]) {
char tmp_dir[] = "/tmp/systemd-private-XXXXXX",
var_tmp_dir[] = "/var/tmp/systemd-private-XXXXXX";
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
assert_se(mkdtemp(tmp_dir));
assert_se(mkdtemp(var_tmp_dir));

5
src/test/test-os-util.c
View File

@ -4,6 +4,7 @@
#include "log.h"
#include "os-util.h"
#include "tests.h"
static void test_path_is_os_tree(void) {
assert_se(path_is_os_tree("/") > 0);
@ -12,9 +13,7 @@ static void test_path_is_os_tree(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_path_is_os_tree();

5
src/test/test-path-lookup.c
View File

@ -8,6 +8,7 @@
#include "rm-rf.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
static void test_paths(UnitFileScope scope) {
char template[] = "/tmp/test-path-lookup.XXXXXXX";
@ -76,9 +77,7 @@ static void print_generator_binary_paths(UnitFileScope scope) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_paths(UNIT_FILE_SYSTEM);
test_paths(UNIT_FILE_USER);

5
src/test/test-path-util.c
View File

@ -12,6 +12,7 @@
#include "stat-util.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
#include "util.h"
#define test_path_compare(a, b, result) { \
@ -506,9 +507,7 @@ static void test_empty_or_root(void) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_path();
test_path_equal_root();

3
src/test/test-path.c
View File

@ -252,8 +252,7 @@ int main(int argc, char *argv[]) {
umask(022);
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
test_path = path_join(NULL, get_testdata_dir(), "test-path");
assert_se(set_unit_path(test_path) >= 0);

5
src/test/test-process-util.c
View File

@ -24,6 +24,7 @@
#include "string-util.h"
#include "terminal-util.h"
#include "test-helper.h"
#include "tests.h"
#include "util.h"
#include "virt.h"
@ -587,9 +588,7 @@ static void test_ioprio_class_from_to_string(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
saved_argc = argc;
saved_argv = argv;

5
src/test/test-random-util.c
View File

@ -3,6 +3,7 @@
#include "hexdecoct.h"
#include "random-util.h"
#include "log.h"
#include "tests.h"
static void test_acquire_random_bytes(bool high_quality_required) {
uint8_t buf[16] = {};
@ -51,9 +52,7 @@ static void test_rdrand64(void) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_acquire_random_bytes(false);
test_acquire_random_bytes(true);

2
src/test/test-sched-prio.c
View File

@ -19,6 +19,8 @@ int main(int argc, char *argv[]) {
Service *ser;
int r;
test_setup_logging(LOG_INFO);
r = enter_cgroup_subroot();
if (r == -ENOMEDIUM)
return log_tests_skipped("cgroupfs not available");

3
src/test/test-seccomp.c
View File

@ -20,6 +20,7 @@
#include "seccomp-util.h"
#include "set.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
#include "virt.h"
@ -668,7 +669,7 @@ static void test_filter_sets_ordered(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_seccomp_arch_to_string();
test_architecture_table();

4
src/test/test-selinux.c
View File

@ -7,6 +7,7 @@
#include "log.h"
#include "selinux-util.h"
#include "string-util.h"
#include "tests.h"
#include "time-util.h"
#include "util.h"
@ -92,8 +93,7 @@ int main(int argc, char **argv) {
if (argc >= 2)
path = argv[1];
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
test_testing();
test_loading();

2
src/test/test-sigbus.c
View File

@ -17,6 +17,8 @@ int main(int argc, char *argv[]) {
void *addr = NULL;
uint8_t *p;
test_setup_logging(LOG_INFO);
#ifdef __SANITIZE_ADDRESS__
return log_tests_skipped("address-sanitizer is enabled");
#endif

3
src/test/test-sleep.c
View File

@ -80,8 +80,7 @@ static void test_sleep(void) {
int main(int argc, char* argv[]) {
int i, r = 0, k;
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
if (getuid() != 0)
log_warning("This program is unlikely to work for unprivileged users");

3
src/test/test-socket-util.c
View File

@ -17,6 +17,7 @@
#include "socket-util.h"
#include "string-util.h"
#include "util.h"
#include "tests.h"
static void test_ifname_valid(void) {
assert(ifname_valid("foo"));
@ -698,7 +699,7 @@ static void test_send_emptydata(void) {
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_ifname_valid();

3
src/test/test-specifier.c
View File

@ -5,6 +5,7 @@
#include "specifier.h"
#include "string-util.h"
#include "strv.h"
#include "tests.h"
static void test_specifier_escape_one(const char *a, const char *b) {
_cleanup_free_ char *x = NULL;
@ -39,7 +40,7 @@ static void test_specifier_escape_strv(void) {
}
int main(int argc, char *argv[]) {
log_set_max_level(LOG_DEBUG);
test_setup_logging(LOG_DEBUG);
test_specifier_escape();
test_specifier_escape_strv();

4
src/test/test-tmpfiles.c
View File

@ -13,6 +13,7 @@
#include "log.h"
#include "process-util.h"
#include "string-util.h"
#include "tests.h"
#include "util.h"
int main(int argc, char** argv) {
@ -21,8 +22,7 @@ int main(int argc, char** argv) {
const char *p = argv[1] ?: "/tmp";
char *pattern;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
pattern = strjoina(p, "/systemd-test-XXXXXX");

4
src/test/test-umount.c
View File

@ -53,9 +53,7 @@ static void test_swap_list(const char *fname) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_mount_points_list(NULL);
test_mount_points_list("/test-umount/empty.mountinfo");

3
src/test/test-unit-file.c
View File

@ -896,8 +896,7 @@ int main(int argc, char *argv[]) {
_cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
int r;
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
r = enter_cgroup_subroot();
if (r == -ENOMEDIUM)

3
src/test/test-unit-name.c
View File

@ -811,8 +811,7 @@ int main(int argc, char* argv[]) {
_cleanup_(rm_rf_physical_and_freep) char *runtime_dir = NULL;
int r, rc = 0;
log_parse_environment();
log_open();
test_setup_logging(LOG_INFO);
r = enter_cgroup_subroot();
if (r == -ENOMEDIUM)

4
src/test/test-watch-pid.c
View File

@ -13,9 +13,7 @@ int main(int argc, char *argv[]) {
Unit *a, *b, *c, *u;
int r;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
if (getuid() != 0)
return log_tests_skipped("not root");

4
src/test/test-watchdog.c
View File

@ -13,9 +13,7 @@ int main(int argc, char *argv[]) {
int r;
bool slow;
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
slow = slow_tests_enabled();

5
src/test/test-xattr-util.c
View File

@ -12,6 +12,7 @@
#include "fs-util.h"
#include "macro.h"
#include "string-util.h"
#include "tests.h"
#include "xattr-util.h"
static void test_fgetxattrat_fake(void) {
@ -78,9 +79,7 @@ static void test_getcrtime(void) {
}
int main(void) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
test_setup_logging(LOG_DEBUG);
test_fgetxattrat_fake();
test_getcrtime();

4
src/timesync/test-timesync.c
View File

@ -5,6 +5,7 @@
#include "log.h"
#include "macro.h"
#include "timesyncd-conf.h"
#include "tests.h"
static void test_manager_parse_string(void) {
/* Make sure that NTP_SERVERS is configured to something
@ -25,8 +26,7 @@ static void test_manager_parse_string(void) {
}
int main(int argc, char **argv) {
log_set_max_level(LOG_DEBUG);
log_parse_environment();
test_setup_logging(LOG_DEBUG);
test_manager_parse_string();