RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmake: fix libcephfs-test.jar build failure

Browse Source 
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>
This commit is contained in:
Tone Zhang 2018-01-30 00:55:38 +00:00
parent 0d4a71ed23
commit 108ac2ca1c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/java/CMakeLists.txt
View File

@ -36,7 +36,7 @@ add_custom_target(
add_dependencies(jni-header libcephfs)
find_jar(JUNIT_JAR
NAMES junit junit4
NAMES junit4 junit
PATHS "/usr/share/java")
if(JUNIT_JAR)
set(CMAKE_JAVA_INCLUDE_PATH ${JUNIT_JAR} ${libcephfs_jar})