Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › d2ad3e3
Attempt to make the tests work on Linux
Brad Davis committed 10 years ago
commit d2ad3e30fd00ef4d2fe23095a651b26be35d5d16
parent 113b075
3 files changed +31 -10
modified .travis.yml
@@ -12,7 +12,7 @@ addons:
      - libssl-dev

      - liblzma-dev
- 
sudo: false
+ 
sudo: required



compiler:

  - clang
modified scripts/install_deps.sh
@@ -28,13 +28,38 @@
# This script is primarily intended for travis CI to be able to setup the

# build environment.
+ 
install_from_github() {
+ 
	local name="${1}"
+ 
	local ver="${2}"
+ 
	local distname="${name}-${ver}"
+
+ 
	# https://github.com/jmmv/kyua/releases/download/kyua-0.12/kyua-0.12.tar.gz
+ 
	local url="https://github.com/jmmv/${name}"
+ 
	wget "${url}/releases/download/${distname}/${distname}.tar.gz"
+ 
	tar -xzvf "${distname}.tar.gz"
+
+ 
	cd "${distname}"
+ 
	./configure \
+ 
		--disable-developer \
+ 
		--without-atf \
+ 
		--without-doxygen \
+ 
		CPPFLAGS="-I/usr/local/include" \
+ 
		LDFLAGS="-L/usr/local/lib -Wl,-R/usr/local/lib" \
+ 
		PKG_CONFIG_PATH="/usr/local/lib/pkgconfig"
+ 
	make
+ 
	sudo make install
+ 
	cd -
+
+ 
	rm -rf "${distname}" "${distname}.tar.gz"
+ 
}
+ 


if [ $(uname -s) = "Darwin" ]; then

	brew update

	brew install libarchive --with-xz

	brew install openssl

	brew install kyua

fi
- 
#elif [ $(uname -s) = "Linux" ]; then
- 
	#sudo apt-get update -qq
- 
	#sudo apt-get install -y libarchive-dev libssl-dev liblzma-dev libldns-dev
- 
#fi
+ 
elif [ $(uname -s) = "Linux" ]; then
+ 
	install_from_github atf 0.21
+ 
	install_from_github kyua 0.12
+ 
fi
modified scripts/travis_build.sh
@@ -49,8 +49,4 @@ fi
# easier to interpret.

make -j4 || make V=1
- 
if [ $(uname -s) = "Darwin" ]; then
- 
  # TODO(sbc100): Figure out how to get kyua and atf installed on the
- 
  # linux travis instances so we can run the tests.
- 
  make check
- 
fi
+ 
make check