Skip to content

[Driver] Force the test one-way-merge-module-fine to use emit-module #38966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 9, 2021
Merged

[Driver] Force the test one-way-merge-module-fine to use emit-module #38966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f7e57d
[Driver] Align definition of the emit-module-separately flag with the…
xymus Sep 8, 2021
3ddbb88
[Driver] Force the use of merge-module in merge-module specific test
xymus Sep 8, 2021
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
9 changes: 7 additions & 2 deletions include/swift/Option/Options.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,8 +590,13 @@ def experimental_cxx_stdlib :

def experimental_emit_module_separately:
Flag<["-"], "experimental-emit-module-separately">,
Flags<[FrontendOption, NoInteractiveOption, HelpHidden]>,
HelpText<"Schedule a swift module emission job instead of a merge-modules job (new Driver only)">;
Flags<[NoInteractiveOption, HelpHidden]>,
HelpText<"Emit module files as a distinct job (new Driver only)">;

def no_emit_module_separately:
Flag<["-"], "no-emit-module-separately">,
Flags<[NoInteractiveOption, HelpHidden]>,
HelpText<"Force using merge-module as the incremental build mode (new Driver only)">;

def requirement_machine_EQ : Joined<["-"], "requirement-machine=">,
Flags<[FrontendOption, ModuleInterfaceOption]>,
Expand Down
4 changes: 2 additions & 2 deletions test/Driver/Dependencies/one-way-merge-module-fine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
// RUN: cp -r %S/Inputs/one-way-fine/* %t
// RUN: touch -t 201401240005 %t/*

// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s
// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v -no-emit-module-separately 2>&1 | %FileCheck -check-prefix=CHECK-FIRST %s

// CHECK-FIRST-NOT: warning
// CHECK-FIRST: Handled main.swift
Expand All @@ -14,7 +14,7 @@
// swift-driver checks existence of all outputs
// RUN: touch -t 201401240006 %t/{main,other,master}.swift{module,doc,sourceinfo}

// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s
// RUN: cd %t && %swiftc_driver -driver-use-frontend-path "%{python.unquoted};%S/Inputs/update-dependencies.py;%swift-dependency-tool" -output-file-map %t/output.json -incremental -driver-always-rebuild-dependents ./main.swift ./other.swift -emit-module-path %t/master.swiftmodule -module-name main -j1 -v -no-emit-module-separately 2>&1 | %FileCheck -check-prefix=CHECK-SECOND %s

// CHECK-SECOND-NOT: warning
// CHECK-SECOND-NOT: Handled
Expand Down