> On Jul 12, 2016, at 10:14 AM, Jordan Rose <jordan_r...@apple.com> wrote: > > It’s possible we’re not treating “macos” the same as “macosx”, and thus > changing the way that methods with the same basename get imported. So it > probably is that change. > > …yep, it looks like we look for literal platform name strings in > ClangImporter.cpp and ImportDecl.cpp.
So we should just change the string match from “macosx” to “macos” in ClangImporter.cpp. Are you working on fixing this? Or should I look into it? I am still trying to get a successful local build of swift. Thanks, Manman > > Jordan > >> On Jul 12, 2016, at 10:06, Manman <m...@apple.com <mailto:m...@apple.com>> >> wrote: >> >> Not sure if this is related to my change of "AvailabilityAttr: we accept >> "macos" as the platform name.”. My change is a mechanic change of supporting >> both macosx and macos, and using “macOS” instead of “OS X” in diagnostics. >> >> For example, this error message does not look related to my change: >> /Users/buildnode/jenkins/workspace/oss-swift-incremental-RA-osx/swift/test/ClangModules/AppKit_test.swift:8:17: >> error: unexpected error produced: method does not override any method from >> its superclass >> >> override func read(from url: URL, ofType type: String) throws { >> >> Cheers, >> Manman >> >>> On Jul 11, 2016, at 7:08 PM, Mishal Shah <mishal_s...@apple.com >>> <mailto:mishal_s...@apple.com>> wrote: >>> >>> Master is currently broken due to following test failure. Can someone >>> please look at these tests failures? >>> >>> Failing Tests (13): >>> Swift :: ClangModules/AppKit_test.swift >>> Swift :: ClangModules/availability_app_extension.swift >>> Swift :: ClangModules/availability_implicit_macosx.swift >>> Swift :: ClangModules/availability_macosx.swift >>> Swift :: ClangModules/enum-with-target.swift >>> Swift :: ClangModules/objc_factory_method.swift >>> Swift :: ClangModules/objc_init.swift >>> Swift :: IDE/print_clang_framework.swift >>> Swift :: Sema/availability_versions_objc_api.swift >>> Swift :: Sema/deprecation_osx.swift >>> Swift :: SourceKit/CursorInfo/cursor_info.swift >>> Swift :: SourceKit/DocSupport/doc_clang_module.swift >>> Swift :: SourceKit/InterfaceGen/gen_clang_module.swift >>> >>> Expected Passes : 8248 >>> Expected Failures : 10 >>> Unsupported Tests : 91 >>> Unexpected Failures: 13 >>> >>> Thanks, >>> Mishal Shah >>>> On Jul 11, 2016, at 7:51 PM, no-re...@swift.org >>>> <mailto:no-re...@swift.org> wrote: >>>> >>>> [FAILURE] oss-swift-incremental-RA-osx [#5124] >>>> >>>> Build URL: https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/ >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/> >>>> Project: oss-swift-incremental-RA-osx >>>> Date of build: Mon, 11 Jul 2016 16:25:55 -0700 >>>> Build duration: 25 min >>>> Identified problems: >>>> >>>> Compile Error: This build failed because of a compile error. Below is a >>>> list of all errors in the build log: >>>> Indication 1 >>>> <https://ci.swift.org//job/oss-swift-incremental-RA-osx/5124/consoleFull#1869590583ee1a197b-acac-4b17-83cf-a53b95139a76> >>>> Regression test failed: This build failed because a regression test in the >>>> test suite FAILed. Below is a list of all errors: >>>> Indication 1 >>>> <https://ci.swift.org//job/oss-swift-incremental-RA-osx/5124/consoleFull#-943443896fca400bf-2f4a-462e-b517-e058d770b2d7> >>>> Tests: >>>> >>>> Name: Swift >>>> Failed: 13 test(s), Passed: 8080 test(s), Total: 8093 test(s) >>>> Failed: Swift.ClangModules.AppKit_test.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/AppKit_test_swift> >>>> Failed: Swift.ClangModules.availability_app_extension.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/availability_app_extension_swift> >>>> Failed: Swift.ClangModules.availability_implicit_macosx.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/availability_implicit_macosx_swift> >>>> Failed: Swift.ClangModules.availability_macosx.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/availability_macosx_swift> >>>> Failed: Swift.ClangModules.enum-with-target.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/enum_with_target_swift> >>>> Failed: Swift.ClangModules.objc_factory_method.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/objc_factory_method_swift> >>>> Failed: Swift.ClangModules.objc_init.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/ClangModules/objc_init_swift> >>>> Failed: Swift.IDE.print_clang_framework.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/IDE/print_clang_framework_swift> >>>> Failed: Swift.Sema.availability_versions_objc_api.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/Sema/availability_versions_objc_api_swift> >>>> Failed: Swift.Sema.deprecation_osx.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/Sema/deprecation_osx_swift> >>>> Failed: Swift.SourceKit/CursorInfo.cursor_info.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/SourceKit_CursorInfo/cursor_info_swift> >>>> Failed: Swift.SourceKit/DocSupport.doc_clang_module.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/SourceKit_DocSupport/doc_clang_module_swift> >>>> Failed: Swift.SourceKit/InterfaceGen.gen_clang_module.swift >>>> <https://ci.swift.org/job/oss-swift-incremental-RA-osx/5124/testReport/junit/Swift/SourceKit_InterfaceGen/gen_clang_module_swift> >>>> Name: Swift-Unit >>>> Failed: 0 test(s), Passed: 269 test(s), Total: 269 test(s) >>>> >>>> Changes >>>> >>>> Commit 2d798a374970e61df4076236887e00a4e6de50c1 by mren: >>>> AvailabilityAttr: we accept "macos" as the platform name. >>>> >>>> edit: lib/AST/Decl.cpp >>>> edit: test/SemaObjC/property-noninherited-availability-attr.m >>>> edit: lib/Basic/Targets.cpp >>>> edit: test/SemaObjC/attr-deprecated.m >>>> edit: lib/Parse/ParseDecl.cpp >>>> edit: include/clang-c/Index.h >>>> edit: test/SemaObjC/attr-availability-1.m >>>> edit: test/SemaObjC/attr-availability.m >>>> edit: test/Sema/attr-availability-macosx.c >>>> edit: test/Sema/attr-availability.c >>>> edit: test/Index/annotate-comments-availability-attrs.cpp >>>> edit: test/SemaCXX/attr-deprecated-replacement-fixit.cpp >>>> edit: include/clang/Basic/Attr.td >>>> edit: include/clang/Basic/DiagnosticParseKinds.td >>>> edit: test/Misc/ast-print-objectivec.m >>>> edit: include/clang/Basic/AttrDocs.td >>>> edit: test/Index/availability.c >>>> >>>> Commit aa31d6532a151cf91a4f6968abd51f4444ed38e4 by mren: >>>> AvailabilityAttr: update the document for macosx >>>> >>>> edit: include/clang/Basic/AttrDocs.td >>>> >>>> Commit fbc4dd3ac8c2400e7f942cfb7325f963660e3455 by renzo.crisostomo: >>>> Create blue folder references for root directories >>>> >>>> edit: Sources/Xcodeproj/pbxproj().swift >>>> edit: Sources/Xcodeproj/generate().swift >>>> edit: Sources/Commands/SwiftPackageTool.swift >>>> edit: Tests/Xcodeproj/GenerateXcodeprojTests.swift >>>> >>>> Commit cd97385117783debb7f704558cbfc48ba950f001 by renzo.crisostomo: >>>> Move findDirectoryReferences to Xcodeproj module >>>> >>>> edit: Sources/Xcodeproj/pbxproj().swift >>>> edit: Sources/Xcodeproj/generate().swift >>>> edit: Sources/Commands/SwiftPackageTool.swift >>>> edit: Tests/Xcodeproj/GenerateXcodeprojTests.swift >>>> >>>> Commit b295acb9672b76d31cbd80cbecedef0dde3410c3 by jordan_rose: >>>> Update for SE-0025 ('private' and 'fileprivate') >>>> >>>> edit: Sources/PackageLoading/PackageExtensions.swift >>>> edit: Sources/SourceControl/CheckoutManager.swift >>>> edit: Sources/Get/Package.swift >>>> edit: Sources/Utility/Path.swift >>>> edit: Sources/Basic/OrderedSet.swift >>>> edit: Sources/Utility/walk.swift >>>> edit: >>>> Fixtures/DependencyResolution/External/Complex/deck-of-playing-cards/src/Deck.swift >>>> edit: Sources/Basic/TOML.swift >>>> edit: Tests/Get/VersionGraphTests.swift >>>> edit: >>>> Fixtures/DependencyResolution/External/IgnoreIndirectTests/deck-of-playing-cards/src/Deck.swift >>>> edit: Sources/PackageLoading/Manifest+parse.swift >>>> edit: Tests/Functional/ClangModuleTests.swift >>>> edit: Sources/Basic/ByteString.swift >>>> edit: Sources/Basic/Path.swift >>>> edit: Sources/Get/PackagesDirectory.swift >>>> edit: Sources/PackageLoading/Module+PkgConfig.swift >>>> edit: Tests/PackageLoading/ModuleDependencyTests.swift >>> >> >
_______________________________________________ swift-dev mailing list swift-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-dev
