aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2018-06-13 02:48:10 +0800
committerGitHub <noreply@github.com>2018-06-13 02:48:10 +0800
commit62b05d415765d8ca31dad7001a4a49648845aa7e (patch)
treeb25f1266838fd45ca3682e06c0afbaa47b984b5b /test
parent3e1fb6b7ffed25f3f12bcf0fe474f2afc9396fe4 (diff)
parentdae790b118d4c7b084d5cf0b0716af182c09509f (diff)
downloaddexon-solidity-62b05d415765d8ca31dad7001a4a49648845aa7e.tar.gz
dexon-solidity-62b05d415765d8ca31dad7001a4a49648845aa7e.tar.zst
dexon-solidity-62b05d415765d8ca31dad7001a4a49648845aa7e.zip
Merge pull request #4283 from ethereum/swap-test-order
Execute external Zeppelin tests before Gnosis
Diffstat (limited to 'test')
-rwxr-xr-xtest/externalTests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 1565d04f..994508f6 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -57,5 +57,5 @@ function test_truffle
}
# Using our temporary fork here. Hopefully to be merged into upstream after the 0.5.0 release.
-test_truffle Gnosis https://github.com/axic/pm-contracts.git -b solidity-050
test_truffle Zeppelin https://github.com/axic/openzeppelin-solidity.git -b solidity-050
+test_truffle Gnosis https://github.com/axic/pm-contracts.git -b solidity-050