Skip to content

Commit

Permalink
tests: Avoid the download template when possible
Browse files Browse the repository at this point in the history
The use of the download template with an hardcoded --arch=amd64 in aa.c
was causing test failures on any platform incapable of running amd64
binaries.

This wasn't noticed in the CI environment as we run the tests within
containers on an amd64 kernel but this caused failures on the Ubuntu CI
environment.

Instead, let's use the busybox template, tweaking the configuration when
needed to match the needs of the testcase.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information
stgraber committed Jun 14, 2014
1 parent 89b92bb commit 05c2acb
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/tests/aa.c
Expand Up @@ -164,10 +164,16 @@ int main(int argc, char *argv[])
goto err;
}
c->save_config(c, NULL);
if (!c->createl(c, "download", NULL, NULL, 0, "-d", "ubuntu", "-r", "trusty", "-a", "amd64", NULL)) {
if (!c->createl(c, "busybox", NULL, NULL, 0, NULL)) {
fprintf(stderr, "%s: %d: failed to create container\n", __FILE__, __LINE__);
goto err;
}

c->clear_config_item(c, "lxc.mount.auto");
c->set_config_item(c, "lxc.mount.entry", "proc proc proc");
c->set_config_item(c, "lxc.mount.entry", "sysfs sys sysfs");
c->save_config(c, NULL);

c->want_daemonize(c, true);
if (!c->startl(c, 0, NULL)) {
fprintf(stderr, "Error starting container");
Expand Down

0 comments on commit 05c2acb

Please sign in to comment.