Use relative path to point to frameworks folder

Author: maniramezan

docs/Testing.md

@@ -353,8 +353,6 @@ Other substitutions:
 
 * ``%clang-importer-sdk``: FIXME.
 
-* ``%clang-importer-sdk-frameworks``: absolute path of the directory where mock frameworks are stored.
-
 * ``%clang_apinotes``: run ``clang -cc1apinotes`` using the locally-built
   clang.
 

test/ClangImporter/MixedSource/resolve-cross-language.swift

@@ -2,7 +2,7 @@
 
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -emit-module -enable-objc-interop -emit-objc-header -o %t %S/Inputs/resolve-cross-language/Base.swift -disable-objc-attr-requires-foundation-module
 // RUN: cp %S/Inputs/resolve-cross-language/Base-module.map %t/module.map
-// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -enable-objc-interop -typecheck -I %t -F %clang-importer-sdk-frameworks -F %S/Inputs/resolve-cross-language %s -verify
+// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -typecheck -I %t -F %clang-importer-sdk-path/frameworks -F %S/Inputs/resolve-cross-language %s -verify
 
 import Base
 import BaseUser

test/Index/cross_language.swift

@@ -8,7 +8,7 @@
 
 // RUN: cat %s > %t/combined.m
 // RUN: cat %S/Inputs/cross_language.m >> %t/combined.m
-// RUN: c-index-test core -print-source-symbols -- %t/combined.m -F %clang-importer-sdk-frameworks -I %t -isysroot %S/../Inputs/clang-importer-sdk >> %t.idx.out
+// RUN: c-index-test core -print-source-symbols -- %t/combined.m -F %clang-importer-sdk-path/frameworks -I %t -isysroot %S/../Inputs/clang-importer-sdk >> %t.idx.out
 // RUN: %FileCheck %t/combined.m -input-file %t.idx.out
 
 #if SWIFT_CODE

test/PrintAsObjC/lit.local.cfg

@@ -6,7 +6,7 @@ config.substitutions.insert(0, ('%check-in-clang',
   '-fmodules-validate-system-headers '
   '-Weverything -Werror -Wno-unused-macros -Wno-incomplete-module '
   '-Wno-auto-import '
-  '-F %%clang-importer-sdk-frameworks '
+  '-F %%clang-importer-sdk-path/frameworks '
   '-I %%clang-include-dir '
   '-isysroot %r/Inputs/clang-importer-sdk' % config.test_source_root) )
 
@@ -15,6 +15,6 @@ config.substitutions.insert(0, ('%check-in-clang\+\+',
   '-Weverything -Werror -Wno-unused-macros -Wno-incomplete-module '
   '-Wno-auto-import -Wno-variadic-macros -Wno-c++98-compat-pedantic '
   '-Wno-unused-command-line-argument ' # for -fmodules-cache-path
-  '-F %%clang-importer-sdk-frameworks '
+  '-F %%clang-importer-sdk-path/frameworks '
   '-I %%clang-include-dir '
   '-isysroot %r/Inputs/clang-importer-sdk' % config.test_source_root) )

test/PrintAsObjC/reintroduced-new.m

@@ -8,11 +8,11 @@
 
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/Inputs/reintroduced-new.swift -swift-version 4 -disable-objc-attr-requires-foundation-module -module-name main
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -parse-as-library %t/main.swiftmodule -typecheck -emit-objc-header-path %t/generated.h -disable-objc-attr-requires-foundation-module -swift-version 4
-// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -F %clang-importer-sdk-frameworks -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-4 %s
+// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -F %clang-importer-sdk-path/frameworks -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck -check-prefix=CHECK -check-prefix=CHECK-4 %s
 
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -emit-module -o %t %S/Inputs/reintroduced-new.swift -disable-objc-attr-requires-foundation-module -module-name main -swift-version 5
 // RUN: %target-swift-frontend(mock-sdk: -sdk %S/../../test/Inputs/clang-importer-sdk -I %t) -parse-as-library %t/main.swiftmodule -typecheck -emit-objc-header-path %t/generated.h -disable-objc-attr-requires-foundation-module -swift-version 5
-// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -F %clang-importer-sdk-frameworks -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck  -check-prefix=CHECK -check-prefix=CHECK-5 %s
+// RUN: not %clang -fsyntax-only -x objective-c %s -include %t/generated.h -fobjc-arc -fmodules -Werror -F %clang-importer-sdk-path/frameworks -isysroot %S/../../test/Inputs/clang-importer-sdk 2>&1 | %FileCheck  -check-prefix=CHECK -check-prefix=CHECK-5 %s
 
 // CHECK-NOT: error:
 

test/PrintAsObjC/swift_name.m

@@ -1,6 +1,6 @@
 // RUN: %empty-directory(%t)
 // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) %S/../Inputs/empty.swift -typecheck -emit-objc-header-path %t/empty.h
-// RUN: %clang -F %clang-importer-sdk-frameworks -E -fobjc-arc -fmodules -isysroot %clang-importer-sdk-path -I %t %s | %FileCheck %s
+// RUN: %clang -F %clang-importer-sdk-path/frameworks -E -fobjc-arc -fmodules -isysroot %clang-importer-sdk-path -I %t %s | %FileCheck %s
 
 // REQUIRES: objc_interop
 

test/lit.cfg

@@ -384,9 +384,6 @@ config.substitutions.append(('%build-clang-importer-objc-overlays',
 config.substitutions.append(('%clang-importer-sdk-path',
                              '%r' % (make_path(config.test_source_root, 'Inputs', 'clang-importer-sdk'))))
 
-config.substitutions.append(('%clang-importer-sdk-frameworks',
-                             '%r' % (make_path(config.test_source_root, 'Inputs', 'clang-importer-sdk', 'frameworks'))))
-
 config.substitutions.append(('%clang-importer-sdk-nosource',
                              '-sdk %r' % (make_path(config.test_source_root, 'Inputs', 'clang-importer-sdk'))))
 # FIXME: END -enable-source-import hackaround