Skip to content

Commit 0f7eb45

Browse files
DougGregorDougGregor
authored
Merge pull request #68867 from rintaro/macros-rdar116239522
[Tests] Mark macro test 'REQUIRES: swift_swift_parser'
2 parents f58aa07 + fc03e2e commit 0f7eb45

File tree

7 files changed

+15
-38
lines changed

7 files changed

+15
-38
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1336,8 +1336,9 @@ if(SWIFT_INCLUDE_TOOLS)
13361336
set(SWIFT_HOST_LIBRARIES_RPATH "$ORIGIN;$ORIGIN/../${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
13371337
endif()
13381338

1339+
file(TO_CMAKE_PATH "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE}" swift_syntax_path)
13391340
FetchContent_Declare(SwiftSyntax
1340-
SOURCE_DIR "${SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE}"
1341+
SOURCE_DIR "${swift_syntax_path}"
13411342
)
13421343
FetchContent_MakeAvailable(SwiftSyntax)
13431344
endfunction()

‎test/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_UNICODE_DATA)
208208
normalize_boolean_spelling(SWIFT_ENABLE_DISPATCH)
209209
normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_OBJC_INTEROP)
210210
normalize_boolean_spelling(SWIFT_ENABLE_BACKTRACING)
211+
normalize_boolean_spelling(SWIFT_BUILD_SWIFT_SYNTAX)
211212
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" SWIFT_OPTIMIZED)
212213

213214
# Get 'SWIFT_HOST_SDKROOT' for lit.site.cfg.in

‎test/IDE/complete_pound_expr.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POUND_EXPR_1 | %FileCheck %s -check-prefix=POUND_EXPR_INTCONTEXT
22
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POUND_EXPR_2 | %FileCheck %s -check-prefix=POUND_EXPR_STRINGCONTEXT
33
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=POUND_EXPR_3 | %FileCheck %s -check-prefix=POUND_EXPR_SELECTORCONTEXT
4-
// REQUIRES: objc_interop
4+
// REQUIRES: objc_interop, swift_swift_parser
55

66
import ObjectiveC
77

‎test/Macros/extension_macro_plugin.swift‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// FIXME: Swift parser is not enabled on Linux CI yet.
2-
// REQUIRES: OS=macosx
1+
// REQUIRES: swift_swift_parser
32

43
// RUN: %empty-directory(%t)
54
// RUN: %empty-directory(%t/plugins)
@@ -13,7 +12,7 @@
1312
// RUN: %S/Inputs/syntax_macro_definitions.swift \
1413
// RUN: -g -no-toolchain-stdlib-rpath
1514

16-
// RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
15+
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
1716
// RUN: -typecheck -verify \
1817
// RUN: -swift-version 5 -enable-experimental-feature ExtensionMacros \
1918
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \

‎test/Macros/macro_plugin_server.swift‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// FIXME: Swift parser is not enabled on Linux CI yet.
2-
// REQUIRES: OS=macosx
1+
// REQUIRES: swift_swift_parser
32

43
// RUN: %empty-directory(%t)
54
// RUN: %empty-directory(%t/plugins)
@@ -21,7 +20,7 @@
2120
// RUN: %S/Inputs/evil_macro_definitions.swift \
2221
// RUN: -g -no-toolchain-stdlib-rpath
2322

24-
// RUN: SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
23+
// RUN: env SWIFT_DUMP_PLUGIN_MESSAGING=1 %swift-target-frontend \
2524
// RUN: -typecheck -verify \
2625
// RUN: -swift-version 5 -enable-experimental-feature Macros \
2726
// RUN: -external-plugin-path %t/plugins#%swift-plugin-server \
@@ -47,9 +46,9 @@
4746

4847
// CHECK: ->(plugin:[[#PID1:]]) {"getCapability":{"capability":{"protocolVersion":[[#PROTOCOL_VERSION:]]}}}
4948
// CHECK-NEXT: <-(plugin:[[#PID1]]) {"getCapabilityResult":{"capability":{"features":["load-plugin-library"],"protocolVersion":[[#PROTOCOL_VERSION]]}}}
50-
// CHECK-NEXT: ->(plugin:[[#PID1]]) {"loadPluginLibrary":{"libraryPath":"BUILD_DIR{{.*}}plugins/libMacroDefinition.dylib","moduleName":"MacroDefinition"}}
49+
// CHECK-NEXT: ->(plugin:[[#PID1]]) {"loadPluginLibrary":{"libraryPath":"{{.*}}MacroDefinition.{{dylib|so|dll}}","moduleName":"MacroDefinition"}}
5150
// CHECK-NEXT: <-(plugin:[[#PID1]]) {"loadPluginLibraryResult":{"diagnostics":[],"loaded":true}}
52-
// CHECK-NEXT: ->(plugin:[[#PID1]]) {"loadPluginLibrary":{"libraryPath":"BUILD_DIR{{.*}}plugins/libEvilMacros.dylib","moduleName":"EvilMacros"}}
51+
// CHECK-NEXT: ->(plugin:[[#PID1]]) {"loadPluginLibrary":{"libraryPath":"{{.*}}EvilMacros.{{dylib|so|dll}}","moduleName":"EvilMacros"}}
5352
// CHECK-NEXT: <-(plugin:[[#PID1]]) {"loadPluginLibraryResult":{"diagnostics":[],"loaded":true}}
5453
// CHECK-NEXT: ->(plugin:[[#PID1]]) {"expandFreestandingMacro":{"discriminator":"${{.*}}","macro":{"moduleName":"MacroDefinition","name":"stringify","typeName":"StringifyMacro"},"macroRole":"expression","syntax":{"kind":"expression","location":{{{.+}}},"source":"#stringify(a + b)"}}}
5554
// CHECK-NEXT: <-(plugin:[[#PID1]]) {"expandMacroResult":{"diagnostics":[],"expandedSource":"(a + b, \"a + b\")"}}
@@ -58,9 +57,9 @@
5857

5958
// CHECK: ->(plugin:[[#PID2:]]) {"getCapability":{"capability":{"protocolVersion":[[#PROTOCOL_VERSION]]}}}
6059
// CHECK-NEXT: <-(plugin:[[#PID2]]) {"getCapabilityResult":{"capability":{"features":["load-plugin-library"],"protocolVersion":[[#PROTOCOL_VERSION]]}}}
61-
// CHECK-NEXT: ->(plugin:[[#PID2]]) {"loadPluginLibrary":{"libraryPath":"BUILD_DIR{{.*}}plugins/libMacroDefinition.dylib","moduleName":"MacroDefinition"}}
60+
// CHECK-NEXT: ->(plugin:[[#PID2]]) {"loadPluginLibrary":{"libraryPath":"{{.*}}MacroDefinition.{{dylib|so|dll}}","moduleName":"MacroDefinition"}}
6261
// CHECK-NEXT: <-(plugin:[[#PID2]]) {"loadPluginLibraryResult":{"diagnostics":[],"loaded":true}}
63-
// CHECK-NEXT: ->(plugin:[[#PID2]]) {"loadPluginLibrary":{"libraryPath":"BUILD_DIR{{.*}}plugins/libEvilMacros.dylib","moduleName":"EvilMacros"}}
62+
// CHECK-NEXT: ->(plugin:[[#PID2]]) {"loadPluginLibrary":{"libraryPath":"{{.*}}EvilMacros.{{dylib|so|dll}}","moduleName":"EvilMacros"}}
6463
// CHECK-NEXT: <-(plugin:[[#PID2]]) {"loadPluginLibraryResult":{"diagnostics":[],"loaded":true}}
6564
// CHECK-NEXT: ->(plugin:[[#PID2]]) {"expandFreestandingMacro":{"discriminator":"${{.*}}","macro":{"moduleName":"MacroDefinition","name":"stringify","typeName":"StringifyMacro"},"macroRole":"expression","syntax":{"kind":"expression","location":{{{.+}}},"source":"#stringify(b + a)"}}}
6665
// CHECK-NEXT: <-(plugin:[[#PID2]]) {"expandMacroResult":{"diagnostics":[],"expandedSource":"(b + a, \"b + a\")"}}

‎utils/build-windows-toolchain.bat‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -190,31 +190,6 @@ cmake --build "%BuildRoot%\curl" --target install || (exit /b)
190190

191191
path %BuildRoot%\toolchains\5.9.0\PFiles64\Swift\runtime-development\usr\bin;%BuildRoot%\toolchains\5.9.0\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain\usr\bin;%Path%
192192

193-
:: Build Swift Syntax
194-
cmake ^
195-
-B "%BuildRoot%\99" ^
196-
197-
-D BUILD_SHARED_LIBS=YES ^
198-
-D CMAKE_BUILD_TYPE=%CMAKE_BUILD_TYPE% ^
199-
-D CMAKE_C_COMPILER=cl.exe ^
200-
-D CMAKE_C_FLAGS="/GS- /Oy /Gw /Gy" ^
201-
-D CMAKE_CXX_COMPILER=cl ^
202-
-D CMAKE_CXX_FLAGS="/GS- /Oy /Gw /Gy" ^
203-
-D CMAKE_MT=mt ^
204-
-D CMAKE_Swift_COMPILER=%BuildRoot%/toolchains/5.9.0/Library/Developer/Toolchains/unknown-Asserts-development.xctoolchain/usr/bin/swiftc.exe ^
205-
-D CMAKE_Swift_FLAGS="-sdk %BuildRoot%/toolchains/5.9.0/Library/Developer/Platforms/Windows.platform/Developer/SDKs/Windows.sdk" ^
206-
-D CMAKE_EXE_LINKER_FLAGS="/INCREMENTAL:NO" ^
207-
-D CMAKE_SHARED_LINKER_FLAGS="/INCREMENTAL:NO" ^
208-
209-
-D CMAKE_INSTALL_PREFIX="%InstallRoot%" ^
210-
211-
-D SWIFT_SYNTAX_ENABLE_WMO_PRE_3_26=YES ^
212-
213-
-G Ninja ^
214-
-S %SourceRoot%\swift-syntax || (exit /b)
215-
cmake --build %BuildRoot%\99 || (exit /b)
216-
cmake --build %BuildRoot%\99 --target install || (exit /b)
217-
218193
:: Build Toolchain
219194
cmake ^
220195
-B "%BuildRoot%\1" ^
@@ -252,12 +227,12 @@ cmake ^
252227
-D SWIFT_ENABLE_EXPERIMENTAL_DIFFERENTIABLE_PROGRAMMING=YES ^
253228
-D SWIFT_ENABLE_EXPERIMENTAL_STRING_PROCESSING=YES ^
254229
-D SWIFT_ENABLE_EXPERIMENTAL_OBSERVATION=YES ^
230+
-D SWIFT_BUILD_SWIFT_SYNTAX=YES ^
255231

256232
-D LLVM_EXTERNAL_SWIFT_SOURCE_DIR="%SourceRoot%\swift" ^
257233
-D LLVM_EXTERNAL_CMARK_SOURCE_DIR="%SourceRoot%\cmark" ^
258234
-D PYTHON_HOME=%PYTHON_HOME% ^
259235
-D PYTHON_EXECUTABLE=%PYTHON_HOME%\python.exe ^
260-
-D SWIFT_PATH_TO_EARLYSWIFTSYNTAX_BUILD_DIR="%BuildRoot%\99" ^
261236
-D SWIFT_PATH_TO_LIBDISPATCH_SOURCE="%SourceRoot%\swift-corelibs-libdispatch" ^
262237
-D SWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE="%SourceRoot%\swift-syntax" ^
263238
-D SWIFT_PATH_TO_STRING_PROCESSING_SOURCE=%SourceRoot%\swift-experimental-string-processing ^

‎utils/build-windows.bat‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -274,6 +274,7 @@ cmake^
274274
-DCMAKE_EXE_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
275275
-DCMAKE_SHARED_LINKER_FLAGS:STRING=/INCREMENTAL:NO^
276276
-DSWIFT_LIT_ARGS="--time-tests"^
277+
-DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
277278
-DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE:PATH=%source_root%\swift-syntax^
278279
-S "%source_root%\swift" %exitOnError%
279280

@@ -318,6 +319,7 @@ cmake^
318319
-DLLDB_DISABLE_PYTHON=YES^
319320
-DLLDB_INCLUDE_TESTS:BOOL=NO^
320321
-DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON^
322+
-DSWIFT_BUILD_SWIFT_SYNTAX=YES ^
321323
-S "%source_root%\llvm-project\lldb" %exitOnError%
322324

323325
cmake --build "%build_root%\lldb" %exitOnError%

0 commit comments

Comments
 (0)