]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cmake: fix libcephfs-test.jar build failure 20250/head
authorTone Zhang <tone.zhang@arm.com>
Tue, 30 Jan 2018 00:55:38 +0000 (00:55 +0000)
committerNathan Cutler <ncutler@suse.com>
Fri, 2 Feb 2018 04:35:38 +0000 (05:35 +0100)
commit5088132cb4a6501114866044325faa0e1c700a21
tree937c3245a49fae9abfc7b3851a2619fa0548431f
parentcf8fd69d16b786caa178ca412c509425766856b4
cmake: fix libcephfs-test.jar build failure

When building Ceph Debian installation package, libcephfs-test.jar
build would fail if multi junit versions are installed on the host.

In src/java/CMakeLists.txt, the "junit" search order is "junit"
and then "junit4". In case multi junit versions are installed,
the lower version (like 3.8) is found firstly, but junit4 is
required only. The search result will cause the failure.

Fix the issue by change search order to firstly search junit4
by default.

Fixes: http://tracker.ceph.com/issues/22828
Signed-off-by: Tone Zhang <tone.zhang@arm.com>
(cherry picked from commit 108ac2ca1ca88af272842fc25a8d412d2607194c)
src/java/CMakeLists.txt