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/osd/osd-scrub-repair.sh: Fix diff options on FreeBSD #15914

Merged
merged 1 commit into from Jun 27, 2017

Conversation

Projects
None yet
3 participants
@wjwithagen
Contributor

wjwithagen commented Jun 26, 2017

  • FreeBSD does not have the -y option

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

test/osd/osd-scrub-repair.sh: Fix diff options
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>

@tchaikov tchaikov added the tests label Jun 26, 2017

@@ -1907,7 +1907,7 @@ function corrupt_scrub_erasure() {
EOF
jq "$jqfilter" $dir/json | python -c "$sortkeys" | sed -e "$sedfilter" > $dir/csjson
diff -y $termwidth $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1
diff ${DIFFCOLOPTS} $dir/checkcsjson $dir/csjson || test $getjson = "yes" || return 1

This comment has been minimized.

@liewegas

liewegas Jun 27, 2017

Member

where is DIFFCOLOPTS defined?

This comment has been minimized.

@tchaikov

tchaikov Jun 27, 2017

Contributor

it's defined in qa/workunits/ceph-helpers.sh.

@tchaikov tchaikov changed the title from test/osd/osd-scrub-repair.sh: Fix diff options to test/osd/osd-scrub-repair.sh: Fix diff options on FreeBSD Jun 27, 2017

@tchaikov tchaikov merged commit 51601f5 into ceph:master Jun 27, 2017

4 checks passed

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

@wjwithagen wjwithagen deleted the wjwithagen:remotes/origin/wip-wjw-freebsd-osd-scrub-repair-3 branch Jun 27, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment