Ubuntu One storage protocol

Merge lp:~dobey/ubuntuone-storage-protocol/no-cpp-tests into lp:ubuntuone-storage-protocol

  1. no-cpp-tests
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 163
Merged at revision: 163
Proposed branch: lp:~dobey/ubuntuone-storage-protocol/no-cpp-tests
Merge into: lp:ubuntuone-storage-protocol
Diff against target: 21 lines (+5/-1)
1 file modified
run-tests (+5/-1)
To merge this branch: bzr merge lp:~dobey/ubuntuone-storage-protocol/no-cpp-tests
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Review via email: mp+207996@code.launchpad.net

Commit message

Don't run tests with cpp protobuf module on newer protobuf versions.

To post a comment you must log in.
Revision history for this message
Roberto Alsina (ralsina) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'run-tests'
--- run-tests 2012-12-03 19:45:43 +0000
+++ run-tests 2014-02-24 18:46:25 +0000
@@ -17,12 +17,16 @@
1717
18SYSNAME=`uname -s`18SYSNAME=`uname -s`
1919
20PROTOC_VERSION_AS_INT=`protoc --version | cut -d' ' -f2 | awk -F. '{ print $ 1 * 1000 + $2 * 100 + $ 3; }'`
21
20/usr/bin/env python setup.py build22/usr/bin/env python setup.py build
21# run the tests with pure python protobuf23# run the tests with pure python protobuf
22PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python u1trial tests24PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=python u1trial tests
23if [ "$SYSNAME" != "Darwin" ]; then25if [ "$SYSNAME" != "Darwin" ]; then
24 # and with the cpp extension, for server (linux) only:26 # and with the cpp extension, for server (linux) only:
25 PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp u1trial tests27 if [ $PROTOC_VERSION_AS_INT -lt 2500 ]; then
28 PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp u1trial tests
29 fi
26fi30fi
2731
28USE_PYFLAKES=1 u1lint32USE_PYFLAKES=1 u1lint

Subscribers

People subscribed via source and target branches