Skip to content

Commit 40bfc1b

Browse files
committed
support tests of SWIG Java
1 parent 2f6999a commit 40bfc1b

File tree

6 files changed

+122
-320
lines changed

6 files changed

+122
-320
lines changed

cmake/setup_test_dir.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
else:
4040
os.remove(path) # only remove files
4141
else:
42-
os.mkdir(output_dir)
42+
os.makedirs(output_dir, exist_ok=True)
4343

4444
if extra_data == "json":
4545
for file in [os.path.basename(p) for p in glob.glob(os.path.join(input_dir,"*.json"))]:

src/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,8 @@ JSON_DATA_TEXT = \"\"\"{
518518
\"rpath_fmt\": \"${RPATH_FMT}\",
519519
\"path_delimiter\": \"${OS_PATH_DELIMITER}\",
520520
\"exe_extension\": \"${EXE_EXTENSION}\",
521-
\"source_include_dir\": \"${CMAKE_CURRENT_SOURCE_DIR}/include\"
521+
\"source_include_dir\": \"${CMAKE_CURRENT_SOURCE_DIR}/include\",
522+
\"jni_includes\": \"${JAVA_INCLUDE_PATH}${OS_PATH_DELIMITER}${JAVA_INCLUDE_PATH2}\"
522523
}\"\"\"
523524
${TEMPLATE}
524525
")

src/interpreter/Engine.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,8 @@ RamDomain Engine::execute(const Node* node, Context& ctxt) {
572572
case FunctorOp::EXP: {
573573
auto first = ramBitCast<RamSigned>(execute(shadow.getChild(0), ctxt));
574574
auto second = ramBitCast<RamSigned>(execute(shadow.getChild(1), ctxt));
575-
return ramBitCast(static_cast<RamSigned>(static_cast<EXP_RamSigned>(std::pow(first, second))));
575+
return ramBitCast(
576+
static_cast<RamSigned>(static_cast<EXP_RamSigned>(std::pow(first, second))));
576577
}
577578

578579
case FunctorOp::UEXP: {

src/souffle-compile.in

-215
This file was deleted.

0 commit comments

Comments
 (0)