[Windows] Fix windows breakage caused by lit.cfg change

[artemcm]

Caused by a change in: #32903

[artemcm]

@swift-ci test

[compnerd]

Using os.path.join is better IMO, though you could just keep this as is I think.

[artemcm]

A lot better, thanks for the pointer.

[artemcm]

@swift-ci test

[swift-ci]

Build failed
Swift Test Linux Platform
Git Sha - 870e80d2d40abba242b6d0651bb833f1b0308b6c

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - 870e80d2d40abba242b6d0651bb833f1b0308b6c

[artemcm]

@swift-ci Please test Windows platform

[compnerd]

@swift-ci please test Windows platform

[artemcm]

@swift-ci Please test OS X platform

[artemcm]

Looks like the original issue was slightly different, it is referring to an "Unrecognized escape code" inside the json map, not referring to incorrect path separators.

[artemcm]

@swift-ci test

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - e42b8f780736ce60953ae7d59b719e31b41d5026

[swift-ci]

Build failed
Swift Test Linux Platform
Git Sha - e42b8f780736ce60953ae7d59b719e31b41d5026

[artemcm]

@swift-ci please test Windows platform

[compnerd]

I believe that there are two categories of failures, some related to the stdlib and others related to the path encoding.

[artemcm]

I believe that there are two categories of failures, some related to the stdlib and others related to the path encoding.

I believe the path encoding failure is caused by the fact that on Linux and macOS, having a comma after the last element of a JSON list is somehow considered to be a valid termination sequence, but on Windows it is not.

[compnerd]

Commas after the last element in a list are not valid json: https://www.json.org/json-en.html

[artemcm]

Actually it seems that having any line ending with a comma is not valid on Windows? Not necessarily even after the last element in a list...

[compnerd]

More likely its line endings ... Windows uses \r\n rather than \n.

[compnerd]

%ononesupport_module ... that is going to have \ in it which is an escape character. The string you are encoding is the cause of the issue.

[artemcm]

It is created as:
ononesupport_module = os.path.join(stdlib_dir, "SwiftOnoneSupport.swiftmodule")
and the corresponding line in the lit test that uses the substitution ends with ":
// RUN: echo "\"modulePath\": \"%ononesupport_module\"" >> %/t/inputs/map.json
Are you referring to the \ used to escape the "?

The error seems to be pointing directly at:

T:\swift\test-windows-x86_64\ScanDependencies\Output\explicit-module-map-forwarding-module.swift.tmp/inputs/map.json:10:2: error: Unrecognized escape code

},

 ^

Which is separating second and third list elements in the generated JSON list...

[compnerd]

The path that is generated from os.path.join there will contain \ which JSON will interpret as an escape sequence even in the quoted string.

From the logs:

: 'RUN: at line 29';   echo "\"modulePath\": \"t:\swift\lib/swift/windows/SwiftOnoneSupport.swiftmodule\"," >> T:/swift/test-windows-x86_64/ScanDependencies/Output/explicit-module-map-forwarding-module.swift.tmp/inputs/map.json

[artemcm]

I'm confused. Here's the most recent failure log: https://ci-external.swift.org/job/swift-PR-windows/5448/consoleText

The resulting path generated by os.path.join is seen in the log in:

$ ":" "RUN: at line 29"
$ "echo" ""modulePath": "t:\swift\lib\swift\windows\x86_64\SwiftOnoneSupport.swiftmodule""

[artemcm]

Ah I see it now in:

: 'RUN: at line 29';   echo "\"modulePath\": \"t:\swift\lib\swift\windows\x86_64\SwiftOnoneSupport.swiftmodule\"" >> T:/swift/test-windows-x86_64/ScanDependencies/Output/explicit-module-map-forwarding-module.swift.tmp/inputs/map.json

[compnerd]

I have a fix, I'll upload it in a second.

[compnerd]

#33066 should take care of it

[artemcm]

@swift-ci test

[swift-ci]

Build failed
Swift Test Linux Platform
Git Sha - b1c97a1eddb2ff90b14a91044f4196c1479dc836

[swift-ci]

Build failed
Swift Test OS X Platform
Git Sha - b1c97a1eddb2ff90b14a91044f4196c1479dc836

[artemcm]

@swift-ci please test Windows platform