From a19856853b3aab33b1015ca97e368c4bfcb105cb Mon Sep 17 00:00:00 2001 From: Andrew Wells Date: Fri, 8 Sep 2023 13:37:21 -0700 Subject: [PATCH] fix build --- CedarJava/build.gradle | 2 +- CedarJava/config.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CedarJava/build.gradle b/CedarJava/build.gradle index f00410e1..a86d070a 100644 --- a/CedarJava/build.gradle +++ b/CedarJava/build.gradle @@ -84,7 +84,7 @@ test { //environment "CEDAR_INTEGRATION_TESTS_ROOT", ''set to absolute path of `cedar-integration-tests`' //environment 'CEDAR_JAVA_FFI_LIB', 'set to absolute path of cedar_java_ffi native library (including file extension)' testLogging { - showStandardStreams true + showStandardStreams false exceptionFormat 'full' } } \ No newline at end of file diff --git a/CedarJava/config.sh b/CedarJava/config.sh index 37f7f352..bb647083 100644 --- a/CedarJava/config.sh +++ b/CedarJava/config.sh @@ -14,7 +14,7 @@ if [ "$(uname)" == "Darwin" ]; then else ffi_lib_str=" environment 'CEDAR_JAVA_FFI_LIB', '"$parent_dir"/CedarJavaFFI/target/debug/libcedar_java_ffi.so'" fi -sed "83s;.*;$ffi_lib_str;" "build.gradle" > new_build.gradle +sed "85s;.*;$ffi_lib_str;" "build.gradle" > new_build.gradle mv new_build.gradle build.gradle # In CI, we need to pull the latest cedar-policy to match the latest cedar-integration-tests @@ -23,7 +23,7 @@ mv new_build.gradle build.gradle # If you call this script with `run_int_tests`, we assume you have `cedar` checkout out in the `cedar-java` dir if [ "$#" -ne 0 ] && [ "$1" == "run_int_tests" ]; then integration_tests_str=" environment 'CEDAR_INTEGRATION_TESTS_ROOT', '"$parent_dir"/cedar/cedar-integration-tests'" - sed "82s;.*;$integration_tests_str;" "build.gradle" > new_build.gradle + sed "84s;.*;$integration_tests_str;" "build.gradle" > new_build.gradle mv new_build.gradle build.gradle export MUST_RUN_CEDAR_INTEGRATION_TESTS=1