From a38c2e6f8dfe7b48410b0c4719c963de6513de0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Fri, 24 Jan 2014 15:51:27 -0500 Subject: [PATCH] tests: Fix startone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix cgroup test to work on multi-core systems - Drop user interaction Signed-off-by: Stéphane Graber --- src/tests/startone.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/tests/startone.c b/src/tests/startone.c index aa607c7f1..b46fc9828 100644 --- a/src/tests/startone.c +++ b/src/tests/startone.c @@ -158,12 +158,6 @@ int main(int argc, char *argv[]) goto out; } - printf("hit return to start container"); - char mychar; - ret = scanf("%c", &mychar); - if (ret < 0) - goto out; - if (!lxc_container_get(c)) { fprintf(stderr, "%d: failed to get extra ref to container\n", __LINE__); exit(1); @@ -196,7 +190,7 @@ int main(int argc, char *argv[]) } len = c->get_cgroup_item(c, "cpuset.cpus", buf, 200); - if (len <= 0 || strcmp(buf, "0\n")) { + if (len <= 0 || strncmp(buf, "0", 1)) { fprintf(stderr, "%d: not able to get cpuset.cpus (len %d buf %s)\n", __LINE__, len, buf); goto out; } @@ -217,10 +211,6 @@ int main(int argc, char *argv[]) c->set_cgroup_item(c, "freezer.state", "THAWED"); - printf("hit return to finish"); - ret = scanf("%c", &mychar); - if (ret < 0) - goto out; c->stop(c); /* feh - multilib has moved the lxc-init crap */