From a9056a348f1741572937ed73084dfee49e579b9f Mon Sep 17 00:00:00 2001
From: Filipe Brandenburger <filbranden@google.com>
Date: Wed, 13 Mar 2019 20:10:38 -0700
Subject: [PATCH] Add $RUNC_USE_SYSTEMD to use systemd cgroup driver in tests

This allows us to test runc using libcontainer's systemd driver, by
passing an extra `--systemd-cgroup` argument to the calls to runc.

Tested:
  $ sudo make localintegration TESTPATH='/exec.bats' RUNC_USE_SYSTEMD=1

And confirmed that systemd was in use by looking at creation and removal
of libcontainer_<pid>_systemd_test_default.slice test slices. Also
introduced a breakage in systemd cgroup driver and confirmed that the
tests failed as expected.

Signed-off-by: Filipe Brandenburger <filbranden@google.com>
---
 tests/integration/exec.bats    | 2 +-
 tests/integration/helpers.bash | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/integration/exec.bats b/tests/integration/exec.bats
index c598718d..0ff2e636 100644
--- a/tests/integration/exec.bats
+++ b/tests/integration/exec.bats
@@ -133,7 +133,7 @@ function teardown() {
   runc run -d --console-socket $CONSOLE_SOCKET test_busybox
   [ "$status" -eq 0 ]
 
-  run bash -c "cat hello > preserve-fds.test; exec 3<preserve-fds.test; $RUNC --log /proc/self/fd/2 --root $ROOT exec --preserve-fds=1 test_busybox cat /proc/self/fd/3"
+  run bash -c "cat hello > preserve-fds.test; exec 3<preserve-fds.test; $RUNC ${RUNC_USE_SYSTEMD:+--systemd-cgroup} --log /proc/self/fd/2 --root $ROOT exec --preserve-fds=1 test_busybox cat /proc/self/fd/3"
   [ "$status" -eq 0 ]
 
   [[ "${output}" == *"hello"* ]]
diff --git a/tests/integration/helpers.bash b/tests/integration/helpers.bash
index da7a98c5..809b4767 100644
--- a/tests/integration/helpers.bash
+++ b/tests/integration/helpers.bash
@@ -61,7 +61,7 @@ function runc() {
 
 # Raw wrapper for runc.
 function __runc() {
-	"$RUNC" --log /proc/self/fd/2 --root "$ROOT" "$@"
+	"$RUNC" ${RUNC_USE_SYSTEMD+--systemd-cgroup} --log /proc/self/fd/2 --root "$ROOT" "$@"
 }
 
 # Wrapper for runc spec, which takes only one argument (the bundle path).