apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-05-15 18:32:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

return error code correctly and cmake fixes

Browse Source
This commit is contained in:
Markus Pilman 2020-09-24 15:58:41 -06:00
parent 4c25214085
commit 33d6c412c1
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bindings/java/CMakeLists.txt
View File

@ -255,12 +255,13 @@ if(NOT OPEN_FOR_IDE)
add_dependencies(fat-jar copy_lib)
add_dependencies(packages fat-jar)
set(TEST_CP ${test_jar} ${target_jar})
if(RUN_JAVA_TESTS)
set(enabled ENABLED)
else()
set(enabled DISABLED)
endif()
add_java_test(NAME DirectoryTest CLASSPATH ${TEST_CP}
set(TEST_CP ${tests_jar} ${target_jar})
message(STATUS "TEST_CP ${TEST_CP}")
add_java_test(NAME DirectoryTest CLASS_PATH ${TEST_CP}
CLASS com.apple.foundationdb.test.DirectoryTest ${enabled})
endif()

5
cmake/AddFdbTest.cmake
View File

@ -405,7 +405,8 @@ function(add_java_test)
if (WIN32)
set(separator ";")
endif()
foreach(path CLASS_PATH)
message(STATUS "CLASSPATH ${T_CLASS_PATH}")
foreach(path ${T_CLASS_PATH})
if(cp)
set(cp "${cp}${separator}${path}")
else()
@ -414,5 +415,5 @@ function(add_java_test)
endforeach()
add_fdbclient_test(
NAME ${T_NAME}
COMMAND ${Java_JAVA_EXECUTABLE} -cp "${cp}" T_CLASS "@CLUSTER_FILE@")
COMMAND ${Java_JAVA_EXECUTABLE} -cp "${cp}" ${T_CLASS} "@CLUSTER_FILE@")
endfunction()

4
tests/TestRunner/tmp_cluster.py
View File

@ -41,6 +41,7 @@ if __name__ == '__main__':
parser.add_argument('--build-dir', metavar='BUILD_DIRECTORY', help='FDB build directory', required=True)
parser.add_argument('cmd', metavar="COMMAND", help="Command to run", nargs='+')
args = parser.parse_args()
errcode = 1
with TempCluster(args.build_dir) as cluster:
print("log-dir: {}".format(cluster.log))
print("etc-dir: {}".format(cluster.etc))
@ -58,4 +59,5 @@ if __name__ == '__main__':
cmd_args.append(str(cluster.etc))
else:
cmd_args.append(cmd)
subprocess.run(cmd_args, stdout=sys.stdout, stderr=sys.stderr)
errcode = subprocess.run(cmd_args, stdout=sys.stdout, stderr=sys.stderr).returncode
sys.exit(errcode)