grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #473 from ethcore/killtest

Browse Source 
Kill bad test.
This commit is contained in:
Arkadiy Paronyan 2016-02-19 12:36:36 +01:00
commit 57ef5e2691
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.md
View File

@ -26,9 +26,8 @@ apt-get install -y --force-yes librocksdb-dev
# install multirust
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sh -s -- --yes
# install nightly and make it default
multirust update nightly
multirust default nightly
# install beta and make it default
multirust default beta
# download and build parity
git clone https://github.com/ethcore/parity
@ -47,12 +46,11 @@ sudo cp -a librocksdb.so* /usr/lib
sudo ldconfig
cd ..
# install rust nightly
# install rust beta
curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh | sudo sh -s -- --yes
# install nightly and make it default
sudo multirust update nightly
sudo multirust default nightly
# install beta and make it default
sudo multirust default beta
# download and build parity
git clone https://github.com/ethcore/parity
@ -68,8 +66,8 @@ brew update
brew install rocksdb
brew install multirust
# install nightly and make it default
multirust update nightly && multirust default nightly
# install beta and make it default
multirust default beta
# download and build parity
git clone https://github.com/ethcore/parity

3
ethcore/src/service.rs
View File

@ -124,6 +124,8 @@ impl IoHandler<NetSyncMessage> for ClientIoHandler {
}
}
// TODO: rewrite into something that doesn't dependent on the testing environment having a particular port ready for use.
/*
#[cfg(test)]
mod tests {
use super::*;
@ -138,3 +140,4 @@ mod tests {
assert!(service.is_ok());
}
}
*/

28
install-deps.sh
View File

@ -346,8 +346,7 @@ function run_installer()
exe brew install rocksdb
info "Installing multirust"
exe brew install multirust
sudo multirust update nightly
sudo multirust default nightly
sudo multirust default beta
echo
}
@ -426,20 +425,20 @@ function run_installer()
depFound=$((depFound+1))
check "multirust"
isMultirust=true
if [[ $(multirust show-default 2>/dev/null | grep nightly | wc -l) == 4 ]]; then
if [[ $(multirust show-default 2>/dev/null | grep beta | wc -l) == 4 ]]; then
depFound=$((depFound+1))
check "rust nightly"
isMultirustNightly=true
check "rust beta"
isMultirustBeta=true
else
uncheck "rust is not nightly"
isMultirustNightly=false
INSTALL_FILES+="${blue}${dim}==> multirust -> rust nightly:${reset}${n}"
uncheck "rust is not beta"
isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust -> rust beta:${reset}${n}"
fi
else
uncheck "multirust is missing"
uncheck "rust nightly is missing"
uncheck "rust beta is missing"
isMultirust=false
isMultirustNightly=false
isMultirustBeta=false
INSTALL_FILES+="${blue}${dim}==> multirust:${reset}${n}"
fi
}
@ -626,10 +625,9 @@ function run_installer()
echo
fi
if [[ $isMultirustNightly == false ]]; then
info "Installing rust nightly..."
multirust update nightly
multirust default nightly
if [[ $isMultirustBeta == false ]]; then
info "Installing rust beta..."
multirust default beta
echo
fi
}
@ -660,7 +658,7 @@ function run_installer()
find_rocksdb
find_multirust
if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustNightly == false ]]; then
if [[ $isCurl == false || $isGit == false || $isMake == false || $isGCC == false || $isRocksDB == false || $isMultirustBeta == false ]]; then
abort_install
fi
fi