diff options
| author |  Dave MacLachlan <dmaclach@google.com> | 2015-11-06 21:04:42 +0000 |
|---|---|---|
| committer |  Florian Weikert <fwe@google.com> | 2015-11-06 22:54:13 +0000 |
| commit | 7fdbd784e82a388a158aa10dde3e3d5ceddefeee (patch) | |
| tree | e582f072b0edc6df373098786549787c16670959 /src/test | |
| parent | 69a3f3621ea5c96edab39fde29fa1eb76d83006c (diff) | |
Add xcrunwrapper to deal with DEVELOPER_DIR and SDKROOT.
Replace uses of $SDKROOT and $DEVELOPER_DIR values in compile paths with __DEVELOPER_DIR__ and __SDKROOT__ to that xcrunwrapper can deal with them appropriately.
RELNOTES:none
--
MOS_MIGRATED_REVID=107259512
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/shell/bazel/BUILD | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/test-setup.sh | 1 | ||||
| -rwxr-xr-x | src/test/shell/bazel/testenv.sh | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD index a9164cf420..c1b548a1d4 100644 --- a/src/test/shell/bazel/BUILD +++ b/src/test/shell/bazel/BUILD @@ -28,6 +28,7 @@ filegroup( "//src/tools/xcode/realpath", "//src/tools/xcode/stdredirect:StdRedirect.dylib", "//src/tools/xcode/swiftstdlibtoolwrapper", + "//src/tools/xcode/xcrunwrapper", "//third_party/iossim", ], "//conditions:default": [], diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh index 9bad3731b9..d5393e7c5a 100755 --- a/src/test/shell/bazel/test-setup.sh +++ b/src/test/shell/bazel/test-setup.sh @@ -326,6 +326,7 @@ function setup_objc_test_support() { [ -e tools/objc/precomp_xcodegen_deploy.jar ] || ln -sv ${xcodegen_path} tools/objc/precomp_xcodegen_deploy.jar [ -e tools/objc/StdRedirect.dylib ] || ln -sv ${stdredirect_path} tools/objc/StdRedirect.dylib [ -e tools/objc/swiftstdlibtoolwrapper.sh ] || ln -sv ${swiftstdlibtoolwrapper_path} tools/objc/swiftstdlibtoolwrapper.sh + [ -e tools/objc/xcrunwrapper.sh ] || ln -sv ${xcrunwrapper_path} tools/objc/xcrunwrapper.sh [ -e tools/objc/realpath ] || ln -sv ${realpath_path} tools/objc/realpath [ -e tools/objc/environment_plist.sh ] || ln -sv ${environment_plist_path} tools/objc/environment_plist.sh diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh index bf6b548f9a..7f2fc6514d 100755 --- a/src/test/shell/bazel/testenv.sh +++ b/src/test/shell/bazel/testenv.sh @@ -63,6 +63,7 @@ xcodegen_path="${TEST_SRCDIR}/src/objc_tools/xcodegen/xcodegen_deploy.jar" stdredirect_path="${TEST_SRCDIR}/src/tools/xcode/stdredirect/StdRedirect.dylib" realpath_path="${TEST_SRCDIR}/src/tools/xcode/realpath/realpath" environment_plist_path="${TEST_SRCDIR}/src/tools/xcode/environment/environment_plist.sh" +xcrunwrapper_path="${TEST_SRCDIR}/src/tools/xcode/xcrunwrapper/xcrunwrapper.sh" # Test data testdata_path=${TEST_SRCDIR}/src/test/shell/bazel/testdata |