[lxc-devel] [PATCH] fix build with --enable-tests

[Serge Hallyn]

Quoting Dwight Engen (dwight.engen at oracle.com):
> Signed-off-by: Dwight Engen <dwight.engen at oracle.com>

d'oh.  thanks.

Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>

> ---
>  src/lxc/lxccontainer.h |  1 +
>  src/tests/cgpath.c     |  3 ++-
>  src/tests/clonetest.c  | 10 +++++-----
>  3 files changed, 8 insertions(+), 6 deletions(-)
> 
> diff --git a/src/lxc/lxccontainer.h b/src/lxc/lxccontainer.h
> index bf3168c..22ccb0b 100644
> --- a/src/lxc/lxccontainer.h
> +++ b/src/lxc/lxccontainer.h
> @@ -103,6 +103,7 @@ struct lxc_container {
>  	 *  then the original backing store's size will be used if possible.  Note this
>  	 *  only applies to the rootfs.  For any other filesystems, the original size
>  	 *  will be duplicated.
> +	 * @hookargs: additional arguments to pass to the clone hook script
>  	 */
>  	struct lxc_container *(*clone)(struct lxc_container *c, const char *newname,
>  		const char *lxcpath, int flags, const char *bdevtype,
> diff --git a/src/tests/cgpath.c b/src/tests/cgpath.c
> index b7f0885..2497e9e 100644
> --- a/src/tests/cgpath.c
> +++ b/src/tests/cgpath.c
> @@ -27,6 +27,7 @@
>  #include <errno.h>
>  #include "../lxc/cgroup.h"
>  #include "../lxc/lxc.h"
> +#include "../lxc/commands.h"
>  
>  #define MYNAME "lxctest1"
>  #define MYNAME2 "lxctest2"
> @@ -39,6 +40,7 @@ int main()
>  {
>  	struct lxc_container *c = NULL, *c2 = NULL;
>  	char *path;
> +	char *dirpath = NULL;
>  	int len;
>  	int ret, retv = -1;
>  
> @@ -136,7 +138,6 @@ int main()
>  		goto out;
>  	}
>  
> -	const char *dirpath;
>  	dirpath = lxc_cmd_get_cgroup_path(NULL, c2->name, c2->config_path);
>  	if (!dirpath) {
>  		TSTERR("getting second container's cgpath");
> diff --git a/src/tests/clonetest.c b/src/tests/clonetest.c
> index 5644405..fbeacdf 100644
> --- a/src/tests/clonetest.c
> +++ b/src/tests/clonetest.c
> @@ -64,7 +64,7 @@ int main(int argc, char *argv[])
>  		goto out;
>  	}
>  
> -	c2 = c->clone(c, MYNAME2, NULL, 0, NULL, NULL, 0);
> +	c2 = c->clone(c, MYNAME2, NULL, 0, NULL, NULL, 0, NULL);
>  	if (!c2) {
>  		fprintf(stderr, "%d: %s clone returned NULL\n", __LINE__, MYNAME2);
>  		goto out;
> @@ -118,7 +118,7 @@ int main(int argc, char *argv[])
>  		goto out;
>  	}
>  
> -	if ((c2 = c->clone(c, "clonetestlvm2", NULL, 0, NULL, NULL, 0)) == NULL) {
> +	if ((c2 = c->clone(c, "clonetestlvm2", NULL, 0, NULL, NULL, 0, NULL)) == NULL) {
>  		fprintf(stderr, "lvm clone failed\n");
>  		goto out;
>  	}
> @@ -134,7 +134,7 @@ int main(int argc, char *argv[])
>  		c2 = NULL;
>  	}
>  
> -	if ((c2 = c->clone(c, "clonetestlvm3", NULL, LXC_CLONE_SNAPSHOT, NULL, NULL, 0)) == NULL) {
> +	if ((c2 = c->clone(c, "clonetestlvm3", NULL, LXC_CLONE_SNAPSHOT, NULL, NULL, 0, NULL)) == NULL) {
>  		fprintf(stderr, "lvm clone failed\n");
>  		goto out;
>  	}
> @@ -148,13 +148,13 @@ int main(int argc, char *argv[])
>  	}
>  
>  	// Now create an overlayfs clone of a dir-backed container
> -	if ((c2 = c->clone(c, "clonetest-o1", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0)) == NULL) {
> +	if ((c2 = c->clone(c, "clonetest-o1", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0, NULL)) == NULL) {
>  		fprintf(stderr, "overlayfs clone of dir failed\n");
>  		goto out;
>  	}
>  
>  	// Now create an overlayfs clone of the overlayfs clone
> -	if ((c3 = c2->clone(c2, "clonetest-o2", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0)) == NULL) {
> +	if ((c3 = c2->clone(c2, "clonetest-o2", NULL, LXC_CLONE_SNAPSHOT, "overlayfs", NULL, 0, NULL)) == NULL) {
>  		fprintf(stderr, "overlayfs clone of overlayfs failed\n");
>  		goto out;
>  	}
> -- 
> 1.8.1.4
> 
> 
> ------------------------------------------------------------------------------
> Try New Relic Now & We'll Send You this Cool Shirt
> New Relic is the only SaaS-based application performance monitoring service 
> that delivers powerful full stack analytics. Optimize and monitor your
> browser, app, & servers with just a few lines of code. Try New Relic
> and get this awesome Nerd Life shirt! http://p.sf.net/sfu/newrelic_d2d_may
> _______________________________________________
> Lxc-devel mailing list
> Lxc-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/lxc-devel