diff options
author | Thomas Van Lenten <thomasvl@google.com> | 2016-05-20 11:06:43 -0400 |
---|---|---|
committer | Thomas Van Lenten <thomasvl@google.com> | 2016-05-20 11:06:43 -0400 |
commit | 6c47faa8901c916d0820ba94b8d78c3465f93e1a (patch) | |
tree | d6dc41c179aed498bfc1846834d82e873e691511 /objectivec/Tests/CocoaPods/OSXCocoaPodsTester | |
parent | c034ba768f244930a476e484334e69b9a6f26931 (diff) | |
download | protobuf-6c47faa8901c916d0820ba94b8d78c3465f93e1a.tar.gz protobuf-6c47faa8901c916d0820ba94b8d78c3465f93e1a.tar.bz2 protobuf-6c47faa8901c916d0820ba94b8d78c3465f93e1a.zip |
Make the CocoaPods integration tests more robust
- Env solution doesn't seem to always work, use template pod files and copy
them in place instead.
- Flush the pods cache before and after runs.
- Make pod install verbose to have the info incase something goes wrong.
Diffstat (limited to 'objectivec/Tests/CocoaPods/OSXCocoaPodsTester')
-rw-r--r-- | objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-framework (renamed from objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile) | 4 | ||||
-rw-r--r-- | objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-static | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile b/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-framework index 956e8148..27eeafc9 100644 --- a/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile +++ b/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-framework @@ -3,9 +3,7 @@ platform :osx, '10.9' install! 'cocoapods', :deterministic_uuids => false -if ENV['USE_FRAMEWORKS'] == 'YES' then - use_frameworks! -end +use_frameworks! target 'OSXCocoaPodsTester' do pod 'Protobuf', :path => '../../../..' diff --git a/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-static b/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-static new file mode 100644 index 00000000..5dfc8de5 --- /dev/null +++ b/objectivec/Tests/CocoaPods/OSXCocoaPodsTester/Podfile-static @@ -0,0 +1,8 @@ +source 'https://github.com/CocoaPods/Specs.git' +platform :osx, '10.9' + +install! 'cocoapods', :deterministic_uuids => false + +target 'OSXCocoaPodsTester' do + pod 'Protobuf', :path => '../../../..' +end |