Skip to content
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.

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

Separate out ObjC code in def_basic Serialization tests. #842

Merged
merged 1 commit into from Jan 6, 2016
Merged

Separate out ObjC code in def_basic Serialization tests. #842

merged 1 commit into from Jan 6, 2016

Conversation

ezephir
Copy link

@ezephir ezephir commented Jan 1, 2016

This change moves functionality that requires ObjC interop into a new file and
removes the XFAIL on Linux. Partially resolves SR-216.

Tested on Ubuntu 14.04 and Mac OS X 10.10.

@gparker42 gparker42 self-assigned this Jan 5, 2016
@gribozavr
Copy link
Collaborator

Tests pass on OS X and Linux.

@@ -9,8 +9,6 @@
// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-module -Xfrontend -disable-diagnostic-passes -force-single-frontend-invocation -Xfrontend -sil-serialize-all -o %t/def_basic.swiftmodule %S/Inputs/def_basic.sil
// RUN: %target-build-swift -Xfrontend %clang-importer-sdk -emit-silgen -Xfrontend -sil-link-all -I %t %s | FileCheck -check-prefix=CHECK_DECL %S/Inputs/def_basic.sil
Copy link
Collaborator

Choose a reason for hiding this comment

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

Could you remove -Xfrontend %clang-importer-sdk and -I %S/../Inputs/clang-importer-sdk/swift-modules everywhere in this file? They are not needed anymore.

This change moves functionality that requires ObjC interop into a new file and
removes the XFAIL on Linux. Partially resolves SR-216.
@ezephir
Copy link
Author

ezephir commented Jan 5, 2016

@gribozavr Thanks! The PR has been updated to remove the obsolete import and SDK.
Retested on OS X and Linux and both work for me.

gribozavr added a commit that referenced this pull request Jan 6, 2016
Separate out ObjC code in def_basic Serialization tests.
@gribozavr gribozavr merged commit 623e6e1 into apple:master Jan 6, 2016
@gribozavr
Copy link
Collaborator

@ezephir Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants