Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.

Issue #25 use filtered check for git diff #39

Merged
merged 1 commit into from
Sep 23, 2015

Conversation

som-snytt
Copy link
Contributor

Unlike normal diff, the git diff feature wasn't using the filtered
check file under --show-diff.

Now the sample displays just the bad line.

!! 1 - neg/t7494-no-options                      [output differs]
% diff /home/apm/projects/snytt/test/files/neg/t7494-no-options-neg.log /home/apm/projects/snytt/test/files/neg/t7494-no-options.check
@@ -1,7 +1,7 @@
 error: Error: ploogin takes no options
     phase name  id  description
     ----------  --  -----------
-        parser   1  parse source into ASTs, perform simple desugaring
+        parser   0  parse source into ASTs, perform simple desugaring
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees

Unlike normal diff, the git diff feature wasn't using the filtered
check file under `--show-diff`.

Now the sample displays just the bad line.

```
!! 1 - neg/t7494-no-options                      [output differs]
% diff /home/apm/projects/snytt/test/files/neg/t7494-no-options-neg.log /home/apm/projects/snytt/test/files/neg/t7494-no-options.check
@@ -1,7 +1,7 @@
 error: Error: ploogin takes no options
     phase name  id  description
     ----------  --  -----------
-        parser   1  parse source into ASTs, perform simple desugaring
+        parser   0  parse source into ASTs, perform simple desugaring
          namer   2  resolve names, attach symbols to named trees
 packageobjects   3  load package objects
          typer   4  the meat and potatoes: type the trees
```
@SethTisue SethTisue self-assigned this Sep 20, 2015
SethTisue added a commit that referenced this pull request Sep 23, 2015
Issue #25 use filtered check for git diff
@SethTisue SethTisue merged commit ee3ae8a into scala:master Sep 23, 2015
@SethTisue
Copy link
Member

thanks Som! this looks Fein. wrong diffs are our Feind.

@som-snytt som-snytt deleted the issue/25 branch April 6, 2017 23:55
lrytz pushed a commit to lrytz/scala-partest that referenced this pull request May 9, 2018
Issue scala#25 use filtered check for git diff
lrytz pushed a commit to lrytz/scala-partest that referenced this pull request May 9, 2018
Issue scala#25 use filtered check for git diff
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants