Merge lp:~xnox/upstart/buildd-cgmanager into lp:upstart/async

[Dimitri John Ledkov]

[James Hunt (jamesodhunt)]

Thanks - applied with minor tweaks.

review: Approve

=== modified file 'test/tests/test_util_check_env.c'
--- test/tests/test_util_check_env.c	2014-05-12 13:21:06 +0000
+++ test/tests/test_util_check_env.c	2014-06-05 11:09:52 +0000
@@ -165,18 +165,24 @@
 
 
 #ifdef ENABLE_CGROUPS
-	TEST_FEATURE ("checking for cgmanager");
-	ret = connect_to_cgmanager();
-	switch(ret) {
-	case -2: TEST_FAILED("Found no cgroup manager"); break;
-	case -1: TEST_FAILED("Error connecting to cgmanager"); break;
-	case 0: print_my_cgroup(); break;
-	default: TEST_FAILED("Unknown error from connect_to_cgmanager: %d", ret);
+	struct stat buffer;
+	int         status;
+	if (stat("/sys/fs/cgroup/cgmanager/sock", &buffer) == 0) {
+		TEST_FEATURE ("checking for cgmanager");
+		ret = connect_to_cgmanager();
+		switch(ret) {
+		case -2: TEST_FAILED("Found no cgroup manager"); break;
+		case -1: TEST_FAILED("Error connecting to cgmanager"); break;
+		case 0: print_my_cgroup(); break;
+		default: TEST_FAILED("Unknown error from connect_to_cgmanager: %d", ret);
+		}
+
+		TEST_FEATURE("cgroup sandbox");
+		TEST_EQ(check_cgroup_sandbox(), 0);
+		disconnect_cgmanager();
+	} else {
+		nih_warn ("Skipping CGManager tests, CGManager socket not found");
 	}
-
-	TEST_FEATURE("cgroup sandbox");
-	TEST_EQ(check_cgroup_sandbox(), 0);
-	disconnect_cgmanager();
 #endif /* ENABLE_CGROUPS */
 
 }