From 5ebfe49f87a5fca1c4e83a60e97ceea48a4ff4f7 Mon Sep 17 00:00:00 2001 From: gaaclarke <30870216+gaaclarke@users.noreply.github.com> Date: Fri, 21 Aug 2020 13:24:19 -0700 Subject: [PATCH] [pigeon] Got the tests running in CI. (#198) --- .cirrus.yml | 24 +++++++++++++++++ .../ios/Flutter/AppFrameworkInfo.plist | 26 +++++++++++++++++++ .../test_objc/ios/Flutter/Debug.xcconfig | 2 ++ .../test_objc/ios/Flutter/Release.xcconfig | 2 ++ packages/pigeon/run_tests.sh | 4 +-- script/local_tests.sh | 22 ++++++++++++++++ 6 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 packages/pigeon/e2e_tests/test_objc/ios/Flutter/AppFrameworkInfo.plist create mode 100644 packages/pigeon/e2e_tests/test_objc/ios/Flutter/Debug.xcconfig create mode 100644 packages/pigeon/e2e_tests/test_objc/ios/Flutter/Release.xcconfig create mode 100755 script/local_tests.sh diff --git a/.cirrus.yml b/.cirrus.yml index b708d7ff63..5b2a6014e6 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -53,3 +53,27 @@ task: build_script: - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH - ./script/incremental_build.sh build-examples --ipa + +task: + use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' + name: local_tests + osx_instance: + image: high-sierra-xcode-9.4.1 + env: + PATH: $PATH:/usr/local/bin + setup_script: + - pod repo update + - git clone https://github.com/flutter/flutter.git + - git fetch origin master + - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH + - flutter doctor + - pub global activate flutter_plugin_tools + - mkdir homebrew && curl -L https://github.com/Homebrew/brew/tarball/master | tar xz --strip 1 -C homebrew + - export PATH=`pwd`/homebrew/bin:$PATH + - brew install java + - brew install clang-format + build_script: + - export PATH=`pwd`/flutter/bin:`pwd`/flutter/bin/cache/dart-sdk/bin:$PATH + - export PATH=`pwd`/homebrew/bin:$PATH + - export PATH=`pwd`/homebrew/opt/openjdk/bin:$PATH + - ./script/local_tests.sh diff --git a/packages/pigeon/e2e_tests/test_objc/ios/Flutter/AppFrameworkInfo.plist b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/AppFrameworkInfo.plist new file mode 100644 index 0000000000..6b4c0f78a7 --- /dev/null +++ b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/AppFrameworkInfo.plist @@ -0,0 +1,26 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + App + CFBundleIdentifier + io.flutter.flutter.app + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + App + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + MinimumOSVersion + 8.0 + + diff --git a/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Debug.xcconfig b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Debug.xcconfig new file mode 100644 index 0000000000..e8efba1146 --- /dev/null +++ b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Release.xcconfig b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Release.xcconfig new file mode 100644 index 0000000000..399e9340e6 --- /dev/null +++ b/packages/pigeon/e2e_tests/test_objc/ios/Flutter/Release.xcconfig @@ -0,0 +1,2 @@ +#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig" +#include "Generated.xcconfig" diff --git a/packages/pigeon/run_tests.sh b/packages/pigeon/run_tests.sh index 2b3ee4f467..a0dd88b5e2 100755 --- a/packages/pigeon/run_tests.sh +++ b/packages/pigeon/run_tests.sh @@ -6,7 +6,7 @@ ############################################################################### # exit when any command fails -set -e +set -ex ############################################################################### # Variables @@ -124,7 +124,7 @@ clang-format -i platform_tests/ios_unit_tests/ios/Runner/messages.h clang-format -i platform_tests/ios_unit_tests/ios/Runner/messages.m pushd $PWD cd platform_tests/ios_unit_tests -flutter build ios +flutter build ios --simulator cd ios xcodebuild \ -workspace Runner.xcworkspace \ diff --git a/script/local_tests.sh b/script/local_tests.sh new file mode 100755 index 0000000000..ca12e4dbf1 --- /dev/null +++ b/script/local_tests.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -e + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)" +REPO_DIR="$(dirname "$SCRIPT_DIR")" +TEST_SCRIPT_NAME="run_tests.sh" + +source "$SCRIPT_DIR/common.sh" + +check_changed_packages + +for PACKAGE in $CHANGED_PACKAGE_LIST; do + PACKAGE_PATH=./packages/$PACKAGE + TEST_SCRIPT=$PACKAGE_PATH/$TEST_SCRIPT_NAME + if [ -e $TEST_SCRIPT ]; then + pushd $PWD + cd $PACKAGE_PATH + ls + ./$TEST_SCRIPT_NAME + popd + fi +done