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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: test/mac/type_envvars/test_nonbundle_executable.sh

Issue 82763006: Fix gyptest-type-envvars.py for Xcode 5.0.0 (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Remove debug Created 6 years, 9 months 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
« test/mac/type_envvars/test_check_sdkroot.sh ('K') | « test/mac/type_envvars/test_check_sdkroot.sh ('k') | test/mac/type_envvars/test_nonbundle_loadable_module.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: test/mac/type_envvars/test_nonbundle_executable.sh
diff --git a/test/mac/type_envvars/test_nonbundle_executable.sh b/test/mac/type_envvars/test_nonbundle_executable.sh
index 5758595d88f2bffb44f3440729de0b1f0dee7eba..4523e3ce20b9e8a880a2cf6b7f3e6018c212fb96 100755
--- a/test/mac/type_envvars/test_nonbundle_executable.sh
+++ b/test/mac/type_envvars/test_nonbundle_executable.sh
@@ -4,6 +4,7 @@
# found in the LICENSE file.
set -e
+
# For some reason, Xcode doesn't set MACH_O_TYPE for non-bundle executables.
# Check for "not set", not just "empty":
[[ ! $MACH_O_TYPE && ${MACH_O_TYPE-_} ]]
@@ -18,5 +19,4 @@ test $EXECUTABLE_PATH = nonbundle_executable
[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]]
[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]]
-# Should be set, but empty.
-[[ ! $SDKROOT && ! ${SDKROOT-_} ]]
+source "$(dirname "$0")/test_check_sdkroot.sh"
« test/mac/type_envvars/test_check_sdkroot.sh ('K') | « test/mac/type_envvars/test_check_sdkroot.sh ('k') | test/mac/type_envvars/test_nonbundle_loadable_module.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698