Skip to content

Commit c365480

Browse files
committed
[test] Replace %swift-build-cxx-plugin with %swift-build-c-plugin
As pointed out in swiftlang#70136 (comment) the substitution name does not make sense because we are compiling C code, not C++. This should not introduce any behavioural changes.
1 parent b2e5d86 commit c365480

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

test/Macros/lit.local.cfg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ if get_target_os() in ['windows-msvc']:
1414
config.substitutions.insert(
1515
0,
1616
(
17-
'%swift-build-cxx-plugin',
17+
'%swift-build-c-plugin',
1818
'%clang -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin'
1919
)
2020
)
@@ -24,7 +24,7 @@ else:
2424
config.substitutions.insert(
2525
0,
2626
(
27-
'%swift-build-cxx-plugin',
27+
'%swift-build-c-plugin',
2828
'%clang %c-flags %exe-linker-flags -isysroot %host_sdk -I %swift_src_root/include -L %swift-lib-dir -l_swiftMockPlugin -Xlinker -rpath -Xlinker %swift-lib-dir'
2929
)
3030
)

test/Macros/macro_plugin_basic.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %empty-directory(%t)
44
// RUN: split-file %s %t
55

6-
// RUN: %swift-build-cxx-plugin -o %t/mock-plugin %t/plugin.c
6+
// RUN: %swift-build-c-plugin -o %t/mock-plugin %t/plugin.c
77

88
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
99
// RUN: -typecheck -verify \

test/Macros/macro_plugin_disable_sandbox.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// RUN: %t/MacroDefinition.swift \
1818
// RUN: -g -no-toolchain-stdlib-rpath
1919

20-
// RUN: %swift-build-cxx-plugin -o %t/mock-plugin %t/TestPlugin.c
20+
// RUN: %swift-build-c-plugin -o %t/mock-plugin %t/TestPlugin.c
2121

2222
//== Nested sandbox. Expected to fail because sandbox-exec doesn't support nested sandboxing.
2323
// RUN: not sandbox-exec -p '(version 1)(allow default)' \

test/Macros/macro_plugin_error.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// RUN: %empty-directory(%t)
44
// RUN: split-file %s %t
55

6-
// RUN: %swift-build-cxx-plugin -o %t/mock-plugin %t/plugin.c
6+
// RUN: %swift-build-c-plugin -o %t/mock-plugin %t/plugin.c
77

88
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
99
// RUN: -typecheck -verify \

test/Macros/macro_plugin_searchorder.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
// RUN: %t/src/MacroDefinition.swift
3838

3939
//#-- For -load-plugin-executable
40-
// RUN: %swift-build-cxx-plugin -o %t/libexec/MacroDefinitionPlugin %t/src/MacroDefinition.c
40+
// RUN: %swift-build-c-plugin -o %t/libexec/MacroDefinitionPlugin %t/src/MacroDefinition.c
4141

4242
//#-- Expect -load-plugin-library
4343
// RUN: %target-build-swift %t/src/test.swift \

test/Macros/macro_swiftdeps.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// RUN: %S/Inputs/syntax_macro_definitions.swift
1616

1717
//#-- Prepare the macro executable plugin.
18-
// RUN: %swift-build-cxx-plugin -o %t/mock-plugin %t/src/plugin.c
18+
// RUN: %swift-build-c-plugin -o %t/mock-plugin %t/src/plugin.c
1919

2020
//#-- Prepare the macro library.
2121
// RUN: %target-swift-frontend \

0 commit comments

Comments
 (0)