diff options
author | gerben-s <gerbens@google.com> | 2018-08-21 15:31:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-21 15:31:54 -0700 |
commit | 0a95f73d0d9874151c0d36d6035230a873fa1715 (patch) | |
tree | a03b7fbaf122909d9aeab5b1769b661fc3cbbbc6 /travis.sh | |
parent | e3eae33fb5840dbec3c2bc9109fa164f6066baa8 (diff) | |
parent | 6155ed8b499c10bdd1f38bcb25866218bc388b7c (diff) |
Merge pull request #116 from haberman/rmgooglepb
Removed a bunch of obsolete code.
Diffstat (limited to 'travis.sh')
-rwxr-xr-x | travis.sh | 16 |
1 files changed, 2 insertions, 14 deletions
@@ -23,17 +23,6 @@ barejit_script() { make test } -# Build with Google protobuf support and tests (with JIT). -withprotobuf_install() { - sudo apt-get update -qq - sudo apt-get install libprotobuf-dev - install_protoc -} -withprotobuf_script() { - make -j12 tests googlepbtests WITH_JIT=yes - make test -} - # Build with strict warnings. warnings_install() { : @@ -103,7 +92,7 @@ ndebug_install() { ndebug_script() { # Override of USER_CPPFLAGS removes -UNDEBUG. export USER_CPPFLAGS="`pkg-config lua5.2 --cflags` -g -fomit-frame-pointer" - make -j12 tests googlepbtests testlua WITH_JIT=yes + make -j12 tests testlua WITH_JIT=yes make test } @@ -127,7 +116,7 @@ coverage_install() { } coverage_script() { export USER_CPPFLAGS="--coverage -O0 `pkg-config lua5.2 --cflags`" - make -j12 tests googlepbtests testlua WITH_JIT=yes + make -j12 tests testlua WITH_JIT=yes make test } coverage_after_success() { @@ -152,7 +141,6 @@ if [ "$1" == "local" ]; then run_config "bare" run_config "barejit" run_config "core32" - run_config "withprotobuf" run_config "lua" run_config "ndebug" run_config "genfiles" |