From f291bc9211cdc6bab12f1334efebe1ce878df405 Mon Sep 17 00:00:00 2001 From: YohanPipereau Date: Tue, 16 Apr 2019 12:55:58 +0200 Subject: Fix docker runtime and Makefile -Remove make test used in build-scvpp and add a test-scvpp instruction -Remove useless build scripts for docker build -Use sysrepo docker image to build sweetcomb docker image -Change makefile clean instruction to avoid errors -Do not put scripts in build-root directory but in sweetcomb root dir -Remove sysrepo compiled in Debug mode causing error looking for symbols Change-Id: Ie1d77f5224ad545da29c0f450403dbd47ca7c563 Signed-off-by: YohanPipereau --- test/run_test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/run_test.sh') diff --git a/test/run_test.sh b/test/run_test.sh index aa28773..8df2f3a 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -25,7 +25,7 @@ function build_enviroment { return fi - docker build -t ${IMAGE} ./src/Docker/Build + docker build -t ${IMAGE} . } function create_container { @@ -47,7 +47,6 @@ function start_container { } function build_sweetcomb { - docker exec -it ${CONTAINER} bash -c "/root/src/sweetcomb/build-root/scripts/de_build.sh" docker exec -it ${CONTAINER} bash -c "apt-get install -y python3-pip && pip3 install pexpect && pip3 install pyroute2" } -- cgit 1.2.3-korg