summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-09-17 15:13:18 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-09-17 16:44:38 -0400
commite9e506ed436859048f6efc3b5962c6809f1a592a (patch)
tree1ace7efbfc917a38eb15576591a8af6bf60e31f8 /src
parent9fb3675e7ef0c6b7a1780980e51492c44fd1faaf (diff)
Make test-login and test-sleep output debugging
Without a call to log_parse_environment(), things like SYSTEMD_LOG_LEVEL do not work.
Diffstat (limited to 'src')
-rw-r--r--src/login/test-login.c9
-rw-r--r--src/test/test-sleep.c12
2 files changed, 19 insertions, 2 deletions
diff --git a/src/login/test-login.c b/src/login/test-login.c
index 945cb38be9..228ddb2933 100644
--- a/src/login/test-login.c
+++ b/src/login/test-login.c
@@ -27,7 +27,7 @@
#include "util.h"
#include "strv.h"
-int main(int argc, char* argv[]) {
+static void test_login(void) {
int r, k;
uid_t u, u2;
char *seat, *type, *class, *display;
@@ -215,6 +215,13 @@ int main(int argc, char* argv[]) {
}
sd_login_monitor_unref(m);
+}
+
+int main(int argc, char* argv[]) {
+ log_parse_environment();
+ log_open();
+
+ test_login();
return 0;
}
diff --git a/src/test/test-sleep.c b/src/test/test-sleep.c
index 545dfab92c..a1020ad14c 100644
--- a/src/test/test-sleep.c
+++ b/src/test/test-sleep.c
@@ -29,7 +29,7 @@
#include "sleep-config.h"
#include "strv.h"
-int main(int argc, char* argv[]) {
+static void test_sleep(void) {
_cleanup_strv_free_ char
**standby = strv_new("standby", NULL),
**mem = strv_new("mem", NULL),
@@ -52,6 +52,16 @@ int main(int argc, char* argv[]) {
log_info("Suspend configured and possible: %s", yes_no(can_sleep("suspend") > 0));
log_info("Hibernation configured and possible: %s", yes_no(can_sleep("hibernate") > 0));
log_info("Hybrid-sleep configured and possible: %s", yes_no(can_sleep("hybrid-sleep") > 0));
+}
+
+int main(int argc, char* argv[]) {
+ log_parse_environment();
+ log_open();
+
+ if (getuid() != 0)
+ log_warning("This program is unlikely to work for unpriviledged users");
+
+ test_sleep();
return 0;
}