From 328c145f226f430c89c4134e36a4593ff74b7581 Mon Sep 17 00:00:00 2001 From: Anup Shahi Date: Tue, 6 Dec 2016 20:05:47 -0800 Subject: [PATCH 1/2] Modified build.sh to also run testasroot target --- misc/scripts/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/misc/scripts/build.sh b/misc/scripts/build.sh index d0448d807..84e3ab552 100755 --- a/misc/scripts/build.sh +++ b/misc/scripts/build.sh @@ -122,7 +122,8 @@ then elif [ "$1" == "pylint" ] then $DOCKER run --rm -it -v $PWD/..:$dir -w $dir $pylint_container $MAKE_ESX pylint -elif [ "$1" == "build" ] || [ "$1" == "clean-as-root" ] +elif [ "$1" == "build" ] || [ "$1" == "clean-as-root" ] || [ "$1" == "testasroot" ] +# we might have to modify this elif in the future if we decide to add more targets then docker_socket=/var/run/docker.sock $DOCKER run --privileged --rm -it \ From 515058d96456b08e96c20a0b89bb220b10894c7c Mon Sep 17 00:00:00 2001 From: Anup Shahi Date: Wed, 7 Dec 2016 10:30:09 -0800 Subject: [PATCH 2/2] Removed elif condition with else --- misc/scripts/build.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/misc/scripts/build.sh b/misc/scripts/build.sh index 84e3ab552..448850c8e 100755 --- a/misc/scripts/build.sh +++ b/misc/scripts/build.sh @@ -122,15 +122,11 @@ then elif [ "$1" == "pylint" ] then $DOCKER run --rm -it -v $PWD/..:$dir -w $dir $pylint_container $MAKE_ESX pylint -elif [ "$1" == "build" ] || [ "$1" == "clean-as-root" ] || [ "$1" == "testasroot" ] -# we might have to modify this elif in the future if we decide to add more targets -then +else docker_socket=/var/run/docker.sock $DOCKER run --privileged --rm -it \ -e "PKG_VERSION=$PKG_VERSION" \ -e "INCLUDE_UI=$INCLUDE_UI" \ -v $docker_socket:$docker_socket \ -v $PWD/..:$dir -w $dir $plug_container $MAKE $1 -else - echo "Error: unknown build target $1" fi