aboutsummaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
authorsveneh <sven@ethdev.com>2015-01-15 00:53:13 +0800
committersveneh <sven@ethdev.com>2015-01-15 00:53:13 +0800
commitfffd9810585210d9b25d03d378471de2d229d4e2 (patch)
treedec0e5616880b3fe504a2af569d37ff82fda942f /ansible
parent9326d0a6dd902435ad13fe23c21d7b8f30fb35ce (diff)
downloadtangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar.gz
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar.bz2
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar.lz
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar.xz
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.tar.zst
tangerine-tests-fffd9810585210d9b25d03d378471de2d229d4e2.zip
uses docker in tesrunner
Diffstat (limited to 'ansible')
-rw-r--r--ansible/Vagrantfile3
-rw-r--r--ansible/test-files/testrunner.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/ansible/Vagrantfile b/ansible/Vagrantfile
index 748085a23..ce6ac3dde 100644
--- a/ansible/Vagrantfile
+++ b/ansible/Vagrantfile
@@ -60,7 +60,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# see http://askubuntu.com/questions/238040/how-do-i-fix-name-service-for-vagrant-client
vb.customize ["modifyvm", :id, "--natdnshostresolver1", "on"]
- vb.customize ["modifyvm", :id, "--memory", "1024"]
+ # cpp client needs a lot of RAM to build
+ vb.customize ["modifyvm", :id, "--memory", "2048"]
end
#
diff --git a/ansible/test-files/testrunner.sh b/ansible/test-files/testrunner.sh
index 08b21c88e..dabea7fb3 100644
--- a/ansible/test-files/testrunner.sh
+++ b/ansible/test-files/testrunner.sh
@@ -4,7 +4,7 @@
#cd ~/software/Ethereum/pyethereum (python has local dependencies so only works from within the directory)
while [ 1 ]
do
- TEST="$(~/software/Ethereum/cpp-ethereum/build/test/createRandomTest)"
+ TEST="$(docker run --rm cpp)"
# echo "$TEST"
# test pyethereum
@@ -13,7 +13,7 @@ do
#RESULT_PYTHON=$?
# test go
- OUTPUT_GO="$(ethtest "$TEST")"
+ OUTPUT_GO="$(docker run --rm go "$TEST")"
RESULT_GO=$?
# test cpp-jit