[Merge] lp:~serge-hallyn/upstart/upstart-fix-cgm-env-tests into lp:upstart

[James Hunt]

Review: Needs Fixing

Hi Serge,

Thanks for doing this. There is a small problem in that even on a correctly configured system, test_checks() still displays "Skipping CGManager tests, CGManager not properly configured".

A minimal fix may be something like the following:

=== modified file 'test/tests/test_util_check_env.c'
--- test/tests/test_util_check_env.c    2014-07-23 18:34:26 +0000
+++ test/tests/test_util_check_env.c    2014-07-24 07:39:49 +0000
@@ -190,7 +190,8 @@
        }
 out_skip:
        disconnect_cgmanager();
-       nih_warn ("Skipping CGManager tests, CGManager not properly configured");
+       if (ret)
+               nih_warn ("Skipping CGManager tests, CGManager not properly configured");
 #endif /* ENABLE_CGROUPS */
 
 }

-- 
https://code.launchpad.net/~serge-hallyn/upstart/upstart-fix-cgm-env-tests/+merge/227976
Your team Upstart Reviewers is subscribed to branch lp:upstart.