Skip to content

L
lxc
Commit 787c3ebe by Serge Hallyn Committed by Stéphane Graber
Options

lxc: tests: use busybox template rather than ubuntu

to speed up tests where it doesn't matter Signed-off-by: 's avatarSerge Hallyn <serge.hallyn@ubuntu.com> Acked-by: 's avatarStéphane Graber <stgraber@ubuntu.com>
parent 395d87ff
Showing with 19 additions and 19 deletions
src/tests/clonetest.c
...@@ -53,7 +53,7 @@ int main(int argc, char *argv[]) ...@@ -53,7 +53,7 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
c->save_config(c, NULL); c->save_config(c, NULL);
if (!c->createl(c, "ubuntu", NULL, NULL, 0, NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%d: failed to create a container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
} }
......
src/tests/createtest.c
...@@ -50,7 +50,7 @@ int main(int argc, char *argv[]) ...@@ -50,7 +50,7 @@ int main(int argc, char *argv[])
} }
c->set_config_item(c, "lxc.network.link", "lxcbr0"); c->set_config_item(c, "lxc.network.link", "lxcbr0");
c->set_config_item(c, "lxc.network.flags", "up"); c->set_config_item(c, "lxc.network.flags", "up");
if (!c->createl(c, "ubuntu", NULL, NULL, 0, "-r", "trusty", NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__); fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__);
goto out; goto out;
} }
......
src/tests/destroytest.c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define MYNAME "lxctest1" #define MYNAME "lxctest1"
static int create_ubuntu(void) static int create_container(void)
{ {
int status, ret; int status, ret;
pid_t pid = fork(); pid_t pid = fork();
...@@ -38,7 +38,7 @@ static int create_ubuntu(void) ...@@ -38,7 +38,7 @@ static int create_ubuntu(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL); ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return // Should not return
perror("execl"); perror("execl");
exit(1); exit(1);
...@@ -76,8 +76,8 @@ int main(int argc, char *argv[]) ...@@ -76,8 +76,8 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
if (create_ubuntu()) { if (create_container()) {
fprintf(stderr, "%d: failed to create a ubuntu container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
} }
......
src/tests/get_item.c
...@@ -171,7 +171,7 @@ int main(int argc, char *argv[]) ...@@ -171,7 +171,7 @@ int main(int argc, char *argv[])
ret = 1; ret = 1;
goto out; goto out;
} }
if (!c->createl(c, "ubuntu", NULL, NULL, 0, "-r", "trusty", NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__); fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__);
ret = 1; ret = 1;
goto out; goto out;
......
src/tests/saveconfig.c
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#define MYNAME "lxctest1" #define MYNAME "lxctest1"
static int create_ubuntu(void) static int create_container(void)
{ {
int status, ret; int status, ret;
pid_t pid = fork(); pid_t pid = fork();
...@@ -38,7 +38,7 @@ static int create_ubuntu(void) ...@@ -38,7 +38,7 @@ static int create_ubuntu(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL); ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return // Should not return
perror("execl"); perror("execl");
exit(1); exit(1);
...@@ -76,8 +76,8 @@ int main(int argc, char *argv[]) ...@@ -76,8 +76,8 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
if (create_ubuntu()) { if (create_container()) {
fprintf(stderr, "%d: failed to create a ubuntu container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
} }
......
src/tests/shutdowntest.c
...@@ -51,8 +51,8 @@ int main(int argc, char *argv[]) ...@@ -51,8 +51,8 @@ int main(int argc, char *argv[])
} }
c->set_config_item(c, "lxc.network.link", "lxcbr0"); c->set_config_item(c, "lxc.network.link", "lxcbr0");
c->set_config_item(c, "lxc.network.flags", "up"); c->set_config_item(c, "lxc.network.flags", "up");
if (!c->createl(c, "ubuntu", NULL, NULL, 0, "-r", "trusty", NULL)) { if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%d: failed to create a trusty container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
} }
......
src/tests/startone.c
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#define MYNAME "lxctest1" #define MYNAME "lxctest1"
static int destroy_ubuntu(void) static int destroy_container(void)
{ {
int status, ret; int status, ret;
pid_t pid = fork(); pid_t pid = fork();
...@@ -61,7 +61,7 @@ again: ...@@ -61,7 +61,7 @@ again:
return WEXITSTATUS(status); return WEXITSTATUS(status);
} }
static int create_ubuntu(void) static int create_container(void)
{ {
int status, ret; int status, ret;
pid_t pid = fork(); pid_t pid = fork();
...@@ -71,7 +71,7 @@ static int create_ubuntu(void) ...@@ -71,7 +71,7 @@ static int create_ubuntu(void)
return -1; return -1;
} }
if (pid == 0) { if (pid == 0) {
ret = execlp("lxc-create", "lxc-create", "-t", "ubuntu", "-n", MYNAME, NULL); ret = execlp("lxc-create", "lxc-create", "-t", "busybox", "-n", MYNAME, NULL);
// Should not return // Should not return
perror("execl"); perror("execl");
exit(1); exit(1);
...@@ -116,9 +116,9 @@ int main(int argc, char *argv[]) ...@@ -116,9 +116,9 @@ int main(int argc, char *argv[])
goto out; goto out;
} }
ret = create_ubuntu(); ret = create_container();
if (ret) { if (ret) {
fprintf(stderr, "%d: failed to create a ubuntu container\n", __LINE__); fprintf(stderr, "%d: failed to create a container\n", __LINE__);
goto out; goto out;
} }
...@@ -251,7 +251,7 @@ ok: ...@@ -251,7 +251,7 @@ ok:
out: out:
if (c) { if (c) {
c->stop(c); c->stop(c);
destroy_ubuntu(); destroy_container();
} }
lxc_container_put(c); lxc_container_put(c);
exit(ret); exit(ret);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment