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

test: fix test-cli-node-options on Windows #16709

Closed
wants to merge 1 commit into from

Conversation

addaleax
Copy link
Member

@addaleax addaleax commented Nov 3, 2017

#16495 broke the Windows build, accounting for \r\n newlines should fix it.

Ref: #16495

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

cli

nodejs#16495 broke the Windows build,
accounting for `\r\n` newlines should fix it.

Ref: nodejs#16495
@addaleax addaleax added cli Issues and PRs related to the Node.js command line interface. test Issues and PRs related to the tests. labels Nov 3, 2017
@addaleax
Copy link
Member Author

addaleax commented Nov 3, 2017

CI: https://ci.nodejs.org/job/node-test-pull-request/11167/

@nodejs/collaborators @apapirovski This should be fast-tracked to unbreak CI

@@ -34,7 +34,7 @@ if (common.hasCrypto) {
expect('--abort_on-uncaught_exception', 'B\n');
expect('--max-old-space-size=0', 'B\n');
expect('--stack-trace-limit=100',
/(\s*at f \(\[eval\]:1:\d*\)\n){100}/,
/(\s*at f \(\[eval\]:1:\d*\)\r?\n){100}/,
Copy link
Member

Choose a reason for hiding this comment

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

Maybe worth making it a non-capturing group:

-        /(\s*at f \(\[eval\]:1:\d*\)\r?\n){100}/, 
+        /(\s*at f \(?:\[eval\]:1:\d*\)\r?\n){100}/, 

Copy link
Contributor

@vsemozhetbyt vsemozhetbyt Nov 3, 2017

Choose a reason for hiding this comment

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

Or rather

-        /(\s*at f \(\[eval\]:1:\d*\)\r?\n){100}/, 
+        /(?:\s*at f \(\[eval\]:1:\d*\)\r?\n){100}/, 

Copy link
Member Author

Choose a reason for hiding this comment

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

Since this is a test file, I’d go with clarity over performance? I know it took me a while to get the hang of what ?: means when learning regexes and seeing that in the wild…

Copy link
Member

Choose a reason for hiding this comment

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

Interesting, I find not using non-capturing groups more confusing, as for me a group is for capturing (I think using it for capturing is more common than using it to repeat with (){x}).

The reason I suggested it was because my first thought was "why does the test need to capture 100 different groups", and the fact that the regex gets passed through a custom function makes it harder to track. Performance is a secondary concern.

@addaleax
Copy link
Member Author

addaleax commented Nov 3, 2017

Landed in 3d4d5e0 to unbreak CI

Feel free to implement suggestions as separate PRs though :)

@addaleax addaleax closed this Nov 3, 2017
@addaleax addaleax deleted the stl-windows branch November 3, 2017 10:47
addaleax added a commit that referenced this pull request Nov 3, 2017
#16495 broke the Windows build,
accounting for `\r\n` newlines should fix it.

Ref: #16495
PR-URL: #16709
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
cjihrig pushed a commit to cjihrig/node that referenced this pull request Nov 6, 2017
nodejs#16495 broke the Windows build,
accounting for `\r\n` newlines should fix it.

Ref: nodejs#16495
PR-URL: nodejs#16709
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
@cjihrig cjihrig mentioned this pull request Nov 6, 2017
@gibfahn
Copy link
Member

gibfahn commented Nov 14, 2017

Should land with #16495 when that lands.

@MylesBorins MylesBorins added the baking-for-lts PRs that need to wait before landing in a LTS release. label Nov 14, 2017
@AndreasMadsen AndreasMadsen mentioned this pull request Jan 16, 2018
4 tasks
@gibfahn gibfahn added land-on-v8.x and removed baking-for-lts PRs that need to wait before landing in a LTS release. lts-watch-v8.x labels Jan 16, 2018
gibfahn pushed a commit to gibfahn/node that referenced this pull request Jan 16, 2018
nodejs#16495 broke the Windows build,
accounting for `\r\n` newlines should fix it.

Ref: nodejs#16495
PR-URL: nodejs#16709
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cli Issues and PRs related to the Node.js command line interface. test Issues and PRs related to the tests.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants