diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-25 14:20:33 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-08-25 16:08:09 +0000 |
| commit | 13680ceb9a468f824e24e448e932eed3a4ad9007 (patch) | |
| tree | 5b8441f3cfc6e2e012172795b9a83f0adc8798fc /mkspecs/macx-ios-clang/ios_destinations.sh | |
| parent | 095abb192577d61215fcf7ea3a55338c54a3c4b0 (diff) | |
| parent | c7cdf3aac7ef9571ce0c0cf25a2c8455c7604451 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'mkspecs/macx-ios-clang/ios_destinations.sh')
| -rwxr-xr-x | mkspecs/macx-ios-clang/ios_destinations.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/macx-ios-clang/ios_destinations.sh b/mkspecs/macx-ios-clang/ios_destinations.sh index b898082598..d80a5cecf4 100755 --- a/mkspecs/macx-ios-clang/ios_destinations.sh +++ b/mkspecs/macx-ios-clang/ios_destinations.sh @@ -39,7 +39,8 @@ ## ############################################################################# -booted_simulator=$(xcrun simctl list devices | grep -E "iPhone|iPad" | grep -v unavailable | grep Booted | perl -lne 'print $1 if /\((.*?)\)/') +DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +booted_simulator=$($DIR/ios_devices.pl "iPhone|iPad" "Booted" "NOT unavailable" | tail -n 1) echo "IPHONESIMULATOR_DEVICES = $booted_simulator" xcodebuild test -scheme $1 -destination 'id=0' -destination-timeout 1 2>&1| sed -n 's/{ \(platform:.*\) }/\1/p' | while read destination; do |