Skip to content

fix tests for FileCheck behaviour (DAG edition) #1634

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

Merged
merged 1 commit into from
Mar 14, 2016

Conversation

compnerd
Copy link
Member

What's in this pull request?

Resolved bug number: (SR-)


Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
OS X platform @swift-ci Please test OS X platform
Linux platform @swift-ci Please test Linux platform

Note: Only members of the Apple organization can trigger swift-ci.

FileCheck does not support the combination negation. These tests were incorrect
and silently passing rather than checking what they intended.

@compnerd
Copy link
Member Author

@benlangmuir one of the tests seem to have been passing silently because what it was checking for was not being checked, opinions on that? Theres a small issue with the patch as it stands which I will fix (I messed up the rebase), but I don't think that the issue in test/IDE/complete_call_arg.swift would be resolved by that.

@@ -9,7 +9,9 @@
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_6 | FileCheck %s -check-prefix=DEFAULT_ARGS_6
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_7 | FileCheck %s -check-prefix=DEFAULT_ARGS_7
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_8 | FileCheck %s -check-prefix=DEFAULT_ARGS_8
// RUN: %target-swift-ide-test -code-completion -source-filename %s -code-completion-token=DEFAULT_ARGS_8 | FileCheck %s -check-prefix=NEGATIVE_DEFAULT_ARGS_8
Copy link
Contributor

Choose a reason for hiding this comment

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

Instead of running swift-ide-test twice, please redirect it to a file and just run FileCheck twice.

@benlangmuir
Copy link
Contributor

Hmm, not sure without seeing how it fails. For now, could you bring back the failing lines, disable them and add a FIXME: comment? I can look into what's going wrong.

@compnerd
Copy link
Member Author

Sure, the lines just show up. Ill add them with a FIXME though.

@compnerd
Copy link
Member Author

Updated with the FIXME and disabled tests and the merge issue.

@compnerd
Copy link
Member Author

Great idea, the FileCheck run is much cheaper. Updated to use temp files.

@benlangmuir
Copy link
Contributor

@swift-ci Please test

@benlangmuir benlangmuir self-assigned this Mar 11, 2016
@benlangmuir
Copy link
Contributor

Ah, in test/IDE/complete_from_swift_module.swift you'll need to use a filename other than %t, which is already being used as a directory by this test.

@compnerd
Copy link
Member Author

Third times a charm, right? I hope.

@benlangmuir
Copy link
Contributor

@swift-ci Please test

@benlangmuir
Copy link
Contributor

complete_underscores.swift:51:30:

<stdin>:28:2:` error: NEGATIVE_TOP_LEVEL_0-NOT: string occurred!
 _internalTopLevelFunc()

I'm not sure why we didn't see the first time.. I guess another FIXME.

@compnerd
Copy link
Member Author

Weird, Ill upload a patch later tonight (or worst case sometime tomorrow).

@benlangmuir
Copy link
Contributor

Thanks for continuing to push on this 👍

@compnerd
Copy link
Member Author

Glad to be of help :-). The test failure was due to a bad conversion of the negative test case, sorry about that. I honestly don't know why I didn't see that failure locally.

@benlangmuir
Copy link
Contributor

@swift-ci Please test

FileCheck does not support the combination negation.  These tests were incorrect
and silently passing rather than checking what they intended.
@compnerd
Copy link
Member Author

Oops, forgot to add the last version of it I believe. There were three tests, and I only had committed the fix for one of them.

@gottesmm
Copy link
Contributor

@swift-ci Please test

@compnerd
Copy link
Member Author

The failure is the same on both (swift-type-transformation crasher), and seems unrelated to the change itself to me.

@benlangmuir
Copy link
Contributor

Let's try it for real then :-)

benlangmuir added a commit that referenced this pull request Mar 14, 2016
fix tests for FileCheck behaviour (DAG edition)
@benlangmuir benlangmuir merged commit 0bdf4a9 into swiftlang:master Mar 14, 2016
@compnerd compnerd deleted the test-fixes-2 branch May 13, 2016 02:24
MaxDesiatov added a commit that referenced this pull request Oct 19, 2020
[WASM] Update assertion condition for keypath projector
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.

3 participants