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

fixes #1708, failing test in arg_split on windows #1709

Merged
merged 1 commit into from May 13, 2012

Conversation

jstenar
Copy link
Member

@jstenar jstenar commented May 7, 2012

There were a conflicting defintion of CommandLineToArgvW.res_type in _process_win32 and _process_win32_controller. This PR fixes the issue.

@jstenar
Copy link
Member Author

jstenar commented May 7, 2012

Apparently #1708 is a duplicate of #1632

@minrk
Copy link
Member

minrk commented May 7, 2012

Does this fix the actual issue, reported in #1632?

@jstenar
Copy link
Member Author

jstenar commented May 7, 2012

Min RK skrev 2012-05-07 21:08:

Does this fix the actual issue, reported in #1632?

At least the steps that caused the crash, ls followed by cd .., does not
cause a crash anymore. So as far as I can tell it fixes the issue.

/Jörgen

@takluyver
Copy link
Member

@jstenar : If you run the test suite against this branch, how many failures do you see? The last test on ShiningPanda had 7, so it should be less than that.

@jstenar
Copy link
Member Author

jstenar commented May 7, 2012

Thomas Kluyver skrev 2012-05-07 21:43:

@jstenar : If you run the test suite against this branch, how many failures do you see? The last test on ShiningPanda had 7, so it should be less than that.


Reply to this email directly or view it on GitHub:
#1709 (comment)

There are fewer failures now and no new ones.

@takluyver
Copy link
Member

Great. No objections from me, then. @minrk, if you're happy with this, go ahead and merge it.

@minrk
Copy link
Member

minrk commented May 7, 2012

Looks good to me, but I would like to wait for a quick confirmation from #1632 and then we can merge, closing that issue.

@minrk
Copy link
Member

minrk commented May 10, 2012

Test results for commit bbd1f50 merged into master
Platform: darwin

  • python2.6: OK (libraries not available: matplotlib pymongo qt tornado wx wx.aui)
  • python2.7: OK (libraries not available: wx wx.aui)
  • python3.2: OK (libraries not available: matplotlib pymongo qt wx wx.aui)

Not available for testing: python3.1

minrk added a commit that referenced this pull request May 13, 2012
fixes #1708, failing test in arg_split on windows

There were a conflicting defintion of CommandLineToArgvW.res_type in _process_win32 and _process_win32_controller. This PR fixes the issue.
@minrk minrk merged commit b9c986f into ipython:master May 13, 2012
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
fixes ipython#1708, failing test in arg_split on windows

There were a conflicting defintion of CommandLineToArgvW.res_type in _process_win32 and _process_win32_controller. This PR fixes the issue.
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