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: Make screencandy optional for FreeBSD #15444

Merged
merged 1 commit into from Jun 21, 2017

Conversation

Projects
None yet
3 participants
@wjwithagen
Copy link
Contributor

wjwithagen commented Jun 3, 2017

  • FreeBSD diff does not have a side-by-side with termwidth
    So differentiate for that

Signed-off-by: Willem Jan Withagen wjw@digiware.nl

@wjwithagen

This comment has been minimized.

Copy link
Contributor Author

wjwithagen commented Jun 13, 2017

@tchaikov
This is the other half of the PR, which is concenerd about diff -y -W

@dzafman

This comment has been minimized.

Copy link
Member

dzafman commented Jun 13, 2017

I don't see where color is involved with this change.

@wjwithagen

This comment has been minimized.

Copy link
Contributor Author

wjwithagen commented Jun 13, 2017

@dzafman
I was under the impression from the commit that introduced this that Linux dif side-by-side would also do coloring of the output?

@dzafman

This comment has been minimized.

Copy link
Member

dzafman commented Jun 13, 2017

@wjwithagen I don't see color on my terminal with "diff -y" although I see some color with "ls."

test: Make screencandy optional for FreeBSD
 - FreeBSD diff does not have a side-by-side with termwidth
   So differentiate for that

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

@wjwithagen wjwithagen force-pushed the wjwithagen:wip-wjw-freebsd-termwidth branch from 378ba56 to 56523be Jun 14, 2017

@wjwithagen

This comment has been minimized.

Copy link
Contributor Author

wjwithagen commented Jun 14, 2017

@dzafman
You are correct, man page says nothing about color. So removed that from commit and PR

@tchaikov

This comment has been minimized.

Copy link
Contributor

tchaikov commented Jun 15, 2017

TestMockInstanceWatcher_NotifySync.WaitingOnNonLeaderAcquireLeader

segfaulted

retest this please

@wjwithagen

This comment has been minimized.

Copy link
Contributor Author

wjwithagen commented Jun 21, 2017

@tchaikov
Seems like Jenkins is happy

@tchaikov tchaikov merged commit 720aea3 into ceph:master Jun 21, 2017

4 checks passed

Signed-off-by all commits in this PR are signed
Details
Unmodified Submodules submodules for project are unmodified
Details
arm64 make check arm64 make check succeeded
Details
make check make check succeeded
Details

@wjwithagen wjwithagen deleted the wjwithagen:wip-wjw-freebsd-termwidth branch Jan 23, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.