Skip to content

[cxx-interop] Cleanup a test now that we can import constructors #34460

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

Merged
merged 1 commit into from
Oct 27, 2020
Merged

[cxx-interop] Cleanup a test now that we can import constructors #34460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/Interop/Cxx/static/Inputs/static-var.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ static constexpr int staticConstexpr = makeStaticConstexpr();

class NonTrivial {
public:
explicit NonTrivial() : val(-1) {}
explicit NonTrivial(int val) : val(val) {}
constexpr NonTrivial(int val, int val2) : val(val + val2) {}
int val;
Expand Down
5 changes: 1 addition & 4 deletions test/Interop/Cxx/static/static-var.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,7 @@ StaticVarTestSuite.test("static-non-trivial-write-from-cxx") {

StaticVarTestSuite.test("static-non-trivial-write-from-swift") {
expectNotEqual(1026, staticNonTrivial.val)
//TODO: Delete `NonTrivial()` adn use `NonTrivial(int)` constructor once
// apple/swift/pull/30630 is merged.
staticNonTrivial = NonTrivial()
staticNonTrivial.val = 1026
staticNonTrivial = NonTrivial(1026)
expectEqual(1026, getstaticNonTrivialFromCxx().pointee.val)
}

Expand Down