Merge pull request #8896 from adrian-prantl/cherry-pick-next-Make-test-more-robust-against-over-eager-module-map-path-resolution

[Cherry-pick into next] Make test more robust against over-eager module map path resolution.

Author: adrian-prantl

lldb/test/API/lang/swift/dwarfimporter/Objective-C/Inputs/module.modulemap renamed to lldb/test/API/lang/swift/dwarfimporter/Objective-C/Inputs/module/module.modulemap

@@ -3,5 +3,6 @@ SWIFT_OBJC_INTEROP = 1
 SWIFT_SOURCES := main.swift
 OBJC_SOURCES := impl.m
 SWIFTFLAGS_EXTRAS := -I$(shell pwd)/include
+CFLAGS_EXTRAS := -I$(shell pwd)/include
 
 include Makefile.rules

lldb/test/API/lang/swift/dwarfimporter/Objective-C/Inputs/objc-header.h renamed to lldb/test/API/lang/swift/dwarfimporter/Objective-C/Inputs/module/objc-header.h

@@ -23,7 +23,7 @@ class TestSwiftDWARFImporterObjC(lldbtest.TestBase):
 
     def build(self):
         include = self.getBuildArtifact('include')
-        inputs = self.getSourcePath('Inputs')
+        inputs = self.getSourcePath(os.path.join('Inputs', 'module'))
         lldbutil.mkdir_p(include)
         import shutil
         for f in ['module.modulemap', 'objc-header.h']: