Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 11 additions & 14 deletions src/debugger/buildConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,14 @@ export class TestingConfigurationFactory {
const libraryPath = toolchain.swiftTestingLibraryPath();
const frameworkPath = toolchain.swiftTestingFrameworkPath();
const swiftPMTestingHelperPath = toolchain.swiftPMTestingHelperPath;
const env = {
...this.testEnv,
...this.sanitizerRuntimeEnvironment,
DYLD_FRAMEWORK_PATH: frameworkPath,
DYLD_LIBRARY_PATH: libraryPath,
SWT_SF_SYMBOLS_ENABLED: "0",
SWT_EXPERIMENTAL_EVENT_STREAM_FIELDS_ENABLED: "1",
};

// Toolchains that contain https://github.com/swiftlang/swift-package-manager/commit/844bd137070dcd18d0f46dd95885ef7907ea0697
// produce a single testing binary for both xctest and swift-testing (called <ProductName>.xctest).
Expand All @@ -354,13 +362,7 @@ export class TestingConfigurationFactory {
])
)
),
env: {
...this.testEnv,
...this.sanitizerRuntimeEnvironment,
DYLD_FRAMEWORK_PATH: frameworkPath,
DYLD_LIBRARY_PATH: libraryPath,
SWT_SF_SYMBOLS_ENABLED: "0",
},
env,
};
return result;
}
Expand All @@ -369,13 +371,7 @@ export class TestingConfigurationFactory {
...baseConfig,
program: await this.testExecutableOutputPath(),
args: this.debuggingTestExecutableArgs(),
env: {
...this.testEnv,
...this.sanitizerRuntimeEnvironment,
DYLD_FRAMEWORK_PATH: frameworkPath,
DYLD_LIBRARY_PATH: libraryPath,
SWT_SF_SYMBOLS_ENABLED: "0",
},
env,
};
return result;
default:
Expand All @@ -398,6 +394,7 @@ export class TestingConfigurationFactory {
...this.testEnv,
...this.sanitizerRuntimeEnvironment,
SWT_SF_SYMBOLS_ENABLED: "0",
SWT_EXPERIMENTAL_EVENT_STREAM_FIELDS_ENABLED: "1",
},
// For coverage we need to rebuild so do the build/test all in one step,
// otherwise we do a build, then test, to give better progress.
Expand Down