From e54c14552f3bee973f515546b946169ec432295a Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Wed, 6 May 2015 20:24:58 -0400 Subject: Don't hardcode bash --- travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'travis.sh') diff --git a/travis.sh b/travis.sh index 556bc91c..0917904b 100755 --- a/travis.sh +++ b/travis.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash build_cpp() { ./autogen.sh -- cgit v1.2.3 From c91d9ab0fd346288b31914419cffaafc558fced3 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 14 May 2015 21:32:39 -0400 Subject: Allow tests to run on OS X --- travis.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'travis.sh') diff --git a/travis.sh b/travis.sh index 0917904b..a7dbc840 100755 --- a/travis.sh +++ b/travis.sh @@ -102,7 +102,8 @@ build_python_cpp() { ./autogen.sh ./configure make -j2 - export LD_LIBRARY_PATH=../src/.libs + export LD_LIBRARY_PATH=../src/.libs # for Linux + export DYLD_LIBRARY_PATH=../src/.libs # for OS X cd python python setup.py build --cpp_implementation python setup.py test --cpp_implementation -- cgit v1.2.3 From e4f4d9fe83887b08b0db67512947645324826755 Mon Sep 17 00:00:00 2001 From: Tamir Duberstein Date: Thu, 7 May 2015 07:40:38 -0400 Subject: Only generate protos in development Fixes #333. --- python/setup.py | 4 ++++ travis.sh | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'travis.sh') diff --git a/python/setup.py b/python/setup.py index 228b00b3..a1365fba 100755 --- a/python/setup.py +++ b/python/setup.py @@ -87,6 +87,10 @@ def generate_proto(source): def GenerateUnittestProtos(): + # Unittest protos are only needed for development. + if not os.path.exists("../.git"): + return + generate_proto("../src/google/protobuf/unittest.proto") generate_proto("../src/google/protobuf/unittest_custom_options.proto") generate_proto("../src/google/protobuf/unittest_import.proto") diff --git a/travis.sh b/travis.sh index a7dbc840..24e0a4e0 100755 --- a/travis.sh +++ b/travis.sh @@ -95,6 +95,8 @@ build_python() { cd python python setup.py build python setup.py test + python setup.py sdist + sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/* cd .. } @@ -107,6 +109,8 @@ build_python_cpp() { cd python python setup.py build --cpp_implementation python setup.py test --cpp_implementation + python setup.py sdist --cpp_implementation + sudo pip install virtualenv && virtualenv /tmp/protoenv && /tmp/protoenv/bin/pip install dist/* cd .. } -- cgit v1.2.3