summaryrefslogtreecommitdiff
path: root/travis.sh
diff options
context:
space:
mode:
authorJosh Haberman <jhaberman@gmail.com>2014-09-01 15:34:14 -0700
committerJosh Haberman <jhaberman@gmail.com>2014-09-01 15:34:14 -0700
commit66a74a4fd53710aaf54a01f668d6a895f9266fbd (patch)
tree7f30313d002eeb5f59a16270f99edb87541adaaf /travis.sh
parent2ccbe04559f8a954f0c0c1a54005e6e26fbf43bf (diff)
Added lua and core32 Travis builds, and rewrote README.md
Diffstat (limited to 'travis.sh')
-rwxr-xr-xtravis.sh26
1 files changed, 24 insertions, 2 deletions
diff --git a/travis.sh b/travis.sh
index 74cc48a..d9bfdbf 100755
--- a/travis.sh
+++ b/travis.sh
@@ -5,7 +5,8 @@ bare_install() {
:
}
bare_script() {
- make -j12 tests && make test
+ make -j12 tests
+ make test
}
# Bare JIT build: no dependencies installed, but JIT enabled.
@@ -13,7 +14,8 @@ barejit_install() {
:
}
barejit_script() {
- make -j12 tests WITH_JIT=yes && make test
+ make -j12 tests WITH_JIT=yes
+ make test
}
# Build with Google protobuf support and tests (with JIT).
@@ -26,6 +28,26 @@ withprotobuf_script() {
make test
}
+# A 32-bit build. Can only test the core because any dependencies
+# need to be available as 32-bit libs also, which gets hairy fast.
+# Can't enable the JIT because it only supports x64.
+core32_install() {
+ :
+}
+core32_script() {
+ make -j12 tests USER_CPPFLAGS=-m32
+ make test
+}
+
+# A build of Lua and running of Lua tests.
+lua_install() {
+ sudo apt-get update -qq
+ sudo apt-get install lua5.2 liblua5.2-dev
+}
+lua_script() {
+ make -j12 testlua USER_CPPFLAGS=`pkg-config lua5.2 --cflags`
+}
+
set -e
set -x
eval ${UPB_TRAVIS_BUILD}_${1}
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback