diff --git a/install.sh b/install.sh index 9ba303d..367a3a7 100755 --- a/install.sh +++ b/install.sh @@ -282,10 +282,11 @@ main () mkdir -p deps pushd deps rm -f ./keyring.gpg - if ! openssl_install; then - echo "Openssl was not built. Exiting." - return 1 - fi +# openssl build disabled. using OS package manager's version. +# if ! openssl_install; then +# echo "Openssl was not built. Exiting." +# return 1 +# fi if ! libffi_install; then echo "Libffi was not built. Exiting." return 1 diff --git a/test/run_tests.sh b/test/run_tests.sh index f619564..222aa0f 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -45,7 +45,7 @@ run_jm_tests () cp -f ./test/bitcoin.conf "${jm_test_datadir}/bitcoin.conf" ${orig_umask} echo "datadir=${jm_test_datadir}" >> "${jm_test_datadir}/bitcoin.conf" - python -m py.test ${HAS_JOSH_K_SEAL_OF_APPROVAL+--cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html} --btcpwd=123456abcdef --btcconf=${jm_test_datadir}/bitcoin.conf --btcuser=bitcoinrpc --nirc=2 --ignore jmclient/test/test_wallets.py --ignore test/test_segwit.py + python -m py.test ${HAS_JOSH_K_SEAL_OF_APPROVAL+--cov=jmclient --cov=jmbitcoin --cov=jmbase --cov=jmdaemon --cov-report html} --btcpwd=123456abcdef --btcconf=${jm_test_datadir}/bitcoin.conf --btcuser=bitcoinrpc --nirc=2 -p no:warnings unlink ./joinmarket.cfg if read bitcoind_pid <"${jm_test_datadir}/bitcoind.pid"; then pkill -15 ${bitcoind_pid} || pkill -9 ${bitcoind_pid}