From c0c29631fd5ea747c97b4c6bc5b44494f3478ec4 Mon Sep 17 00:00:00 2001 From: Ivan Mikushin Date: Thu, 15 Oct 2015 16:56:28 +0500 Subject: [PATCH] Do not remove usr in test runs --- tests/integration/assets/test_02/test-custom-kernel.sh | 2 +- tests/integration/rancherostest/util.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/assets/test_02/test-custom-kernel.sh b/tests/integration/assets/test_02/test-custom-kernel.sh index 72cd3844..4c34daa7 100755 --- a/tests/integration/assets/test_02/test-custom-kernel.sh +++ b/tests/integration/assets/test_02/test-custom-kernel.sh @@ -7,4 +7,4 @@ cp ./tests/integration/assets/test_02/build.conf ./ make -f Makefile.docker DEV_BUILD=1 minimal -exec ./scripts/run --qemu --no-rebuild --fresh +exec ./scripts/run --qemu --no-rebuild --no-rm-usr --fresh diff --git a/tests/integration/rancherostest/util.py b/tests/integration/rancherostest/util.py index 541c26f6..9afa6d6a 100644 --- a/tests/integration/rancherostest/util.py +++ b/tests/integration/rancherostest/util.py @@ -48,7 +48,7 @@ def rancheros_version(build_conf): def run_qemu(request, run_args=[]): print('\nStarting QEMU') - p = subprocess.Popen(['./scripts/run', '--qemu', '--no-rebuild', '--fresh'] + run_args, + p = subprocess.Popen(['./scripts/run', '--qemu', '--no-rebuild', '--no-rm-usr', '--fresh'] + run_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, universal_newlines=True) def fin():