diff --git a/extras/build-tests/nix/run-tests b/extras/build-tests/nix/run-tests index 326c2d1b6..819046f50 100755 --- a/extras/build-tests/nix/run-tests +++ b/extras/build-tests/nix/run-tests @@ -22,7 +22,7 @@ else fi # Install 'ircfly' -git clone https://github.com/unrealircd/ircfly.git +git clone -q https://github.com/unrealircd/ircfly.git cd ircfly bundle install bundle exec rake build @@ -34,10 +34,10 @@ fi cd .. # Install 'cipherscan' -git clone https://github.com/mozilla/cipherscan +git clone -q https://github.com/mozilla/cipherscan # Install 'unrealircd-tests' -git clone https://github.com/unrealircd/unrealircd-tests.git +git clone -q https://github.com/unrealircd/unrealircd-tests.git cd unrealircd-tests bundle install mv config.yaml.example config.yaml diff --git a/extras/build-tests/nix/select-config b/extras/build-tests/nix/select-config index ac0185a92..745d17222 100755 --- a/extras/build-tests/nix/select-config +++ b/extras/build-tests/nix/select-config @@ -4,16 +4,22 @@ # It is not meant to be used by end-users # +function fail() +{ + echo "select-config failed: $*" + exit 1 +} + function build_ssl { DIR="$2" URL="$1/$2.tar.gz" savewd="$PWD" cd ~ wget "$URL" || exit 1 - tar xzvf $DIR.tar.gz + tar xzf $DIR.tar.gz cd "$DIR" - (./configure --prefix=$HOME/ssl || ./config --prefix=$HOME/ssl -fPIC) || exit 1 - (make -j2 && make install) || exit 1 + (./configure --prefix=$HOME/ssl 1>/dev/null 2>&1 || ./config --prefix=$HOME/ssl -fPIC 1>/dev/null 2>&1 ) || fail "build_ssl: configure/config failed" + (make -j2 1>/dev/null 2>&1 && make install 1>/dev/null 2>&1) || fail "build_ssl: make failed" cd "$savewd" echo "SSLDIR=$HOME/ssl" >>config.settings }