dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove build dependencies for java tests. (#12021) 

Summary:
Final fix for https://github.com/facebook/rocksdb/issues/12013

- Reverting back changes on CirleCI explicit image declaration.
- Removed CMake dependencies between java classed and java test classes.

Pull Request resolved: https://github.com/facebook/rocksdb/pull/12021

Reviewed By: akankshamahajan15

Differential Revision: D50745392

Pulled By: ajkr

fbshipit-source-id: 6a7a1da1e7e4da8da72130c9272915974e10fffc
This commit is contained in:
Radek Hubner 2023-10-30 10:08:19 -07:00 committed by Facebook GitHub Bot
parent 60df39e530
commit b3fd3838d4
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.circleci/config.yml
View File

@ -600,7 +600,6 @@ jobs:
build-windows-vs2019: build-windows-vs2019:
executor: executor:
name: win/server-2019 name: win/server-2019
version: 2023.08.1
size: 2xlarge size: 2xlarge
environment: environment:
THIRDPARTY_HOME: C:/Users/circleci/thirdparty THIRDPARTY_HOME: C:/Users/circleci/thirdparty

3
java/CMakeLists.txt
View File

@ -557,13 +557,12 @@ else ()
endif() endif()
get_target_property(ROCKSDBJNI_CLASSES_JAR_FILE rocksdbjni_classes JAR_FILE)
add_jar( add_jar(
rocksdbjni_test_classes rocksdbjni_test_classes
SOURCES SOURCES
${JAVA_MAIN_CLASSES} ${JAVA_MAIN_CLASSES}
${JAVA_TEST_CLASSES} ${JAVA_TEST_CLASSES}
INCLUDE_JARS ${ROCKSDBJNI_CLASSES_JAR_FILE} ${JAVA_TESTCLASSPATH} INCLUDE_JARS ${JAVA_TESTCLASSPATH}
GENERATE_NATIVE_HEADERS rocksdbjni_test_headers DESTINATION ${JNI_OUTPUT_DIR} GENERATE_NATIVE_HEADERS rocksdbjni_test_headers DESTINATION ${JNI_OUTPUT_DIR}
) )