cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

external test scripts: Quote variables properly

Browse Source
This commit is contained in:
Kamil Śliwak 2020-12-01 20:31:30 +01:00
parent e04cc80438
commit 0a29218848
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/common.sh
View File

@ -37,21 +37,21 @@ safe_kill()
local n=1 local n=1
# only proceed if $PID does exist # only proceed if $PID does exist
kill -0 $PID 2>/dev/null || return kill -0 "$PID" 2>/dev/null || return
echo "Sending SIGTERM to ${NAME} (${PID}) ..." echo "Sending SIGTERM to ${NAME} (${PID}) ..."
kill $PID kill "$PID"
# wait until process terminated gracefully # wait until process terminated gracefully
while kill -0 $PID 2>/dev/null && [[ $n -le 4 ]]; do while kill -0 "$PID" 2>/dev/null && [[ $n -le 4 ]]; do
echo "Waiting ($n) ..." echo "Waiting ($n) ..."
sleep 1 sleep 1
n=$[n + 1] n=$[n + 1]
done done
# process still alive? then hard-kill # process still alive? then hard-kill
if kill -0 $PID 2>/dev/null; then if kill -0 "$PID" 2>/dev/null; then
echo "Sending SIGKILL to ${NAME} (${PID}) ..." echo "Sending SIGKILL to ${NAME} (${PID}) ..."
kill -9 $PID kill -9 "$PID"
fi fi
} }

8
test/externalTests.sh
View File

@ -42,10 +42,10 @@ source test/externalTests/common.sh
printTask "Running external tests..." printTask "Running external tests..."
$REPO_ROOT/externalTests/zeppelin.sh "$SOLJSON" "$REPO_ROOT/externalTests/zeppelin.sh" "$SOLJSON"
$REPO_ROOT/externalTests/gnosis.sh "$SOLJSON" "$REPO_ROOT/externalTests/gnosis.sh" "$SOLJSON"
$REPO_ROOT/externalTests/colony.sh "$SOLJSON" "$REPO_ROOT/externalTests/colony.sh" "$SOLJSON"
$REPO_ROOT/externalTests/ens.sh "$SOLJSON" "$REPO_ROOT/externalTests/ens.sh" "$SOLJSON"
# Disabled temporarily as it needs to be updated to latest Truffle first. # Disabled temporarily as it needs to be updated to latest Truffle first.
#test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050 #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050

6
test/externalTests/solc-js/solc-js.sh
View File

@ -41,10 +41,10 @@ function solcjs_test
echo "require('./determinism.js');" >> test/index.js echo "require('./determinism.js');" >> test/index.js
printLog "Copying determinism.js..." printLog "Copying determinism.js..."
cp -f $SOLCJS_INPUT_DIR/determinism.js test/ cp -f "$SOLCJS_INPUT_DIR/determinism.js" test/
printLog "Copying contracts..." printLog "Copying contracts..."
cp -Rf $SOLCJS_INPUT_DIR/DAO test/ cp -Rf "$SOLCJS_INPUT_DIR/DAO" test/
printLog "Copying SMTChecker tests..." printLog "Copying SMTChecker tests..."
cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests test/ cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests test/
@ -52,7 +52,7 @@ function solcjs_test
# Update version (needed for some tests) # Update version (needed for some tests)
echo "Updating package.json to version $VERSION" echo "Updating package.json to version $VERSION"
npm version --allow-same-version --no-git-tag-version $VERSION npm version --allow-same-version --no-git-tag-version "$VERSION"
run_test compile_fn test_fn run_test compile_fn test_fn
} }