aboutsummaryrefslogtreecommitdiffhomepage
path: root/objectivec/Tests/CocoaPods/iOSCocoaPodsTester
diff options
context:
space:
mode:
authorGravatar Thomas Van Lenten <thomasvl@google.com>2016-05-20 11:06:43 -0400
committerGravatar Thomas Van Lenten <thomasvl@google.com>2016-05-20 11:06:43 -0400
commit6c47faa8901c916d0820ba94b8d78c3465f93e1a (patch)
treed6dc41c179aed498bfc1846834d82e873e691511 /objectivec/Tests/CocoaPods/iOSCocoaPodsTester
parentc034ba768f244930a476e484334e69b9a6f26931 (diff)
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/iOSCocoaPodsTester')
-rw-r--r--objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-framework (renamed from objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile)4
-rw-r--r--objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-static8
2 files changed, 9 insertions, 3 deletions
diff --git a/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile b/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-framework
index cc353f16..913a289b 100644
--- a/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile
+++ b/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-framework
@@ -3,9 +3,7 @@ platform :ios, '8.0'
install! 'cocoapods', :deterministic_uuids => false
-if ENV['USE_FRAMEWORKS'] == 'YES' then
- use_frameworks!
-end
+use_frameworks!
target 'iOSCocoaPodsTester' do
pod 'Protobuf', :path => '../../../..'
diff --git a/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-static b/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-static
new file mode 100644
index 00000000..e9b3c235
--- /dev/null
+++ b/objectivec/Tests/CocoaPods/iOSCocoaPodsTester/Podfile-static
@@ -0,0 +1,8 @@
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
+
+install! 'cocoapods', :deterministic_uuids => false
+
+target 'iOSCocoaPodsTester' do
+ pod 'Protobuf', :path => '../../../..'
+end