Skip to content

Fix SR-1444, Match Xcode's c99name #337

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

Jump to bottom
Merged
merged 1 commit into from
May 16, 2016
Merged

Fix SR-1444, Match Xcode's c99name #337

merged 1 commit into from
May 16, 2016

Conversation

aciidgh
Copy link
Contributor

@aciidgh aciidgh commented May 10, 2016

dependent on #336

ddunbar
ddunbar reviewed May 10, 2016
View reviewed changes
Tests/Xcodeproj/FunctionalTests.swift
try fputs(stream.bytes.bytes, fp)
}
return path
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this just go into Utility or somewhere?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how about Utility/File.swift or Utility/misc.swift?

@aciidgh
Copy link
Contributor Author

aciidgh commented May 10, 2016

rebased

@ddunbar
Copy link
Contributor

ddunbar commented May 10, 2016

I see test failures with this:

output: Compile Swift Module 'Module_Name_1' (1 sources)
Compile Swift Module 'Module_Name_2' (1 sources)
/private/var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces Fixture.BdeFtu/Spaces Fixture/Sources/Module Name 2/Foo.swift:1:8: error: no such module 'ModuleName1'
import ModuleName1
       ^
<unknown>:0: error: build had 1 command failures
swift-build: error: exit(1): /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build-tool -f /private/var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces\ Fixture.BdeFtu/Spaces\ Fixture/.build/debug.yaml

SWIFT_EXEC: nil
swift-build: /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build
/Volumes/Data/ddunbar/public/swift-project/swiftpm/Tests/Functional/MiscellaneousTests.swift:371: error: -[FunctionalTestSuite.MiscellaneousTestCase testSpaces] : failed - `swift build -c Debug' failed:

exit(1): /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build --chdir /var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces\ Fixture.BdeFtu/Spaces\ Fixture --configuration debug

    Building Release
output: Compile Swift Module 'Module_Name_1' (1 sources)
Compile Swift Module 'Module_Name_2' (1 sources)
/private/var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces Fixture.BdeFtu/Spaces Fixture/Sources/Module Name 2/Foo.swift:1:8: error: no such module 'ModuleName1'
import ModuleName1
       ^
<unknown>:0: error: build had 1 command failures
swift-build: error: exit(1): /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build-tool -f /private/var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces\ Fixture.BdeFtu/Spaces\ Fixture/.build/release.yaml

SWIFT_EXEC: nil
swift-build: /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build
/Volumes/Data/ddunbar/public/swift-project/swiftpm/Tests/Functional/MiscellaneousTests.swift:371: error: -[FunctionalTestSuite.MiscellaneousTestCase testSpaces] : failed - `swift build -c Release' failed:

exit(1): /Volumes/Data/ddunbar/public/swift-project/build/Ninja-ReleaseAssert/swiftpm-macosx-x86_64/debug/swift-build --chdir /var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces\ Fixture.BdeFtu/Spaces\ Fixture --configuration release

/Volumes/Data/ddunbar/public/swift-project/swiftpm/Tests/Functional/MiscellaneousTests.swift:372: error: -[FunctionalTestSuite.MiscellaneousTestCase testSpaces] : failed - Expected file doesn’t exist: /var/folders/yh/3pgbfsz165q2t6pyg3ktvw0r0000gn/T/Miscellaneous_Spaces Fixture.BdeFtu/Spaces Fixture/.build/debug/ModuleName1.build/Foo.swift.o
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testSpaces]' failed (0.733 seconds).
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTestDependenciesComplex]' started.
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTestDependenciesComplex]' passed (0.052 seconds).
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTestDependenciesSimple]' started.
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTestDependenciesSimple]' passed (0.000 seconds).
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTipHasNoPackageSwift]' started.
    Building Debug
    Building Release
Test Case '-[FunctionalTestSuite.MiscellaneousTestCase testTipHasNoPackageSwift]' passed (5.033 seconds).

ddunbar
ddunbar reviewed May 10, 2016
View reviewed changes
Sources/PackageType/c99name().swift
default:
return false
return "_"
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there is another change needed here, there is a loop below this one that deletes leading characters I believe.

@aciidgh aciidgh force-pushed the fix-sr-1444 branch 2 times, most recently from bf9c5a6 to 0e51b42 Compare May 10, 2016 19:07
@aciidgh
Copy link
Contributor Author

aciidgh commented May 10, 2016

@ddunbar Fixed

@aciidgh
Copy link
Contributor Author

aciidgh commented May 15, 2016

@swift-ci please test

@aciidgh aciidgh mentioned this pull request May 15, 2016
Closed
3 tasks
@ddunbar
Copy link
Contributor

ddunbar commented May 16, 2016 •
edited
Loading

Have you looked at the test failure? It does look like it might be related (it might just be a test that needs to be updated).

@aciidgh
Copy link
Contributor Author

aciidgh commented May 16, 2016

This should fix it swiftlang/swift-integration-tests#6

@ddunbar ddunbar merged commit 29bc38d into swiftlang:master May 16, 2016
@aciidgh aciidgh deleted the fix-sr-1444 branch May 16, 2016 16:51
@aciidgh aciidgh mentioned this pull request May 15, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@aciidgh @ddunbar