Merge #579

579: Problem:(CRO-574) integration test cannot run on linux r=tomtau a=leejw51crypto Solution: add fixes for linux fix env error add sudo Co-authored-by: jongwhan lee <[email protected]>
crypto-com · Nov 14, 2019 · 227325b · 227325b
2 parents 75e6f36 + 4971789
commit 227325b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/chain-tx-enclave/tx-validation/make.sh b/chain-tx-enclave/tx-validation/make.sh
@@ -3,4 +3,5 @@ set -e
 
 source /root/.docker_bashrc
 cd ./chain-tx-enclave/tx-validation
+make clean
 make
diff --git a/integration-tests/env.sh b/integration-tests/env.sh
@@ -28,8 +28,11 @@ function check_command_exist() {
 
 # Awlays execute at script located directory
 CWD=$(pwd)
-if [ x"$(basename "${0}")" = "xenv.sh" ]; then
-    cd "$(dirname "${0}")"
+# in non interactive shell
+# ${0} is -bash
+# TODO: replace this line, to make it work on non interactive shell
+if [ x"$(basename -- "${0}")" = "xenv.sh" ]; then
+    cd "$(dirname -- "${0}")"
 fi
 # Travis CI run `. ./env.sh` using `build.sh`. i.e. `${0}`` is `/home/travis/build.sh`
 

diff --git a/integration-tests/prepare.sh b/integration-tests/prepare.sh
@@ -5,6 +5,9 @@ IFS=
 # Global function return value
 RET_VALUE=0
 
+# change attribute
+chmod ug+s ./docker-data
+
 # @argument message
 function print_message() {
     echo "[$(date +"%Y-%m-%d|%T")] ${1}"