diff options
| author | Alex Beregszaszi <alex@rtfs.hu> | 2017-09-13 04:37:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-13 04:37:49 +0800 |
| commit | 8bb96eaaf533b17cd9c9109642455408f551348c (patch) | |
| tree | a1bbcbb897207e1f73aebd7a910a4ec7b3836e12 | |
| parent | 5084a9cda9ed913e50cf393d21764a620827191c (diff) | |
| parent | 622a2d8251b467ded5a3134349198005f44faf6a (diff) | |
| download | dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar.gz dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar.bz2 dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar.lz dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar.xz dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.tar.zst dexon-solidity-8bb96eaaf533b17cd9c9109642455408f551348c.zip | |
Merge pull request #2893 from ethereum/travis-clang-build
Travis CI: Do not cache build dir
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | scripts/test_emscripten.sh | 47 | ||||
| -rwxr-xr-x | test/externalTests.sh | 5 |
3 files changed, 26 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 315d29bf..5d6ce442 100644 --- a/.travis.yml +++ b/.travis.yml @@ -174,7 +174,6 @@ cache: ccache: true directories: - boost_1_57_0 - - build - $HOME/.local install: diff --git a/scripts/test_emscripten.sh b/scripts/test_emscripten.sh index f1d44a1f..b01b33bb 100755 --- a/scripts/test_emscripten.sh +++ b/scripts/test_emscripten.sh @@ -29,28 +29,29 @@ set -e REPO_ROOT=$(cd $(dirname "$0")/.. && pwd) - -cd $REPO_ROOT/build - -echo "Preparing solc-js..." -rm -rf solc-js -git clone https://github.com/ethereum/solc-js -cd solc-js -npm install - -# Replace soljson with current build -echo "Replacing soljson.js" -rm -f soljson.js -# Make a copy because paths might not be absolute -cp ../solc/soljson.js soljson.js - -# Update version (needed for some tests) -VERSION=$(../../scripts/get_version.sh) -echo "Updating package.json to version $VERSION" -npm version $VERSION - -echo "Running solc-js tests..." -npm run test +SOLJSON="$REPO_ROOT/build/solc/soljson.js" + +DIR=$(mktemp -d) +( + echo "Preparing solc-js..." + git clone --depth 1 https://github.com/ethereum/solc-js "$DIR" + cd "$DIR" + npm install + + # Replace soljson with current build + echo "Replacing soljson.js" + rm -f soljson.js + cp "$SOLJSON" soljson.js + + # Update version (needed for some tests) + VERSION=$("$REPO_ROOT/scripts/get_version.sh") + echo "Updating package.json to version $VERSION" + npm version --no-git-tag-version $VERSION + + echo "Running solc-js tests..." + npm run test +) +rm -rf "$DIR" echo "Running external tests...." -"$REPO_ROOT"/test/externalTests.sh "$REPO_ROOT"/build/solc/soljson.js +"$REPO_ROOT/test/externalTests.sh" "$SOLJSON" diff --git a/test/externalTests.sh b/test/externalTests.sh index 1b74561b..6ff2ebc5 100755 --- a/test/externalTests.sh +++ b/test/externalTests.sh @@ -38,10 +38,9 @@ SOLJSON="$1" DIR=$(mktemp -d) ( - cd "$DIR" echo "Running Zeppelin tests..." - git clone https://github.com/OpenZeppelin/zeppelin-solidity.git - cd zeppelin-solidity + git clone --depth 1 https://github.com/OpenZeppelin/zeppelin-solidity.git "$DIR" + cd "$DIR" npm install cp "$SOLJSON" ./node_modules/solc/soljson.js npm run test |