Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1707)

Unified Diff: test/mac/sdkroot/test_shorthand.sh

Issue 83073002: Fix gyptest-sdkroot when oldest SDK is >= 10.8 (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « test/mac/gyptest-sdkroot.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/mac/sdkroot/test_shorthand.sh
diff --git a/test/mac/sdkroot/test_shorthand.sh b/test/mac/sdkroot/test_shorthand.sh
index d768fba09950d0ac57cd85b6619364b0228fa23d..ac4ac229aeefa106d8ddf6b09814c9c633f63622 100755
--- a/test/mac/sdkroot/test_shorthand.sh
+++ b/test/mac/sdkroot/test_shorthand.sh
@@ -5,8 +5,16 @@
set -e
-if ! expected=$(xcodebuild -version -sdk macosx10.6 Path 2>/dev/null) ; then
- expected=$(xcodebuild -version -sdk macosx10.7 Path)
+found=false
+for sdk in 10.6 10.7 10.8 10.9 ; do
+ if expected=$(xcodebuild -version -sdk macosx$sdk Path 2>/dev/null) ; then
+ found=true
+ break
+ fi
+done
+if ! $found ; then
+ echo >&2 "cannot find installed SDK"
+ exit 1
fi
test $SDKROOT = $expected
« no previous file with comments | « test/mac/gyptest-sdkroot.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698