Merge pull request #119 from arik-so/arik/2024/01/skip-tests-option

Create an option to skip tests

diff --git a/deterministic-build-wrappers/clang-x86_64-windows b/deterministic-build-wrappers/clang-x86_64-windows
index 31bb0280b63963656c0ac4065c4b373984a6d867..6c925dd8109a67d12f56a6b2b1509d8c2716632b 100755 (executable)
--- a/deterministic-build-wrappers/clang-x86_64-windows
+++ b/deterministic-build-wrappers/clang-x86_64-windows
@@ -1,2 +1,2 @@
 #!/bin/bash
-clang -target x86_64-pc-windows-gnu -L/usr/lib/gcc/x86_64-w64-mingw32/12-win32/ "$@"
+clang -fembed-bitcode -fuse-ld=lld -target x86_64-pc-windows-gnu "$@"

diff --git a/genbindings.sh b/genbindings.sh
index 1c5fd52576b4efb5f0a29c80012e83fa349bd5da..b7ae3717c1008dcab9e2118f041c3b572b4f2dc4 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -569,6 +569,7 @@ fi
 
 EXTRA_TARGETS=( $LDK_C_BINDINGS_EXTRA_TARGETS )
 EXTRA_CCS=( $LDK_C_BINDINGS_EXTRA_TARGET_CCS )
+EXTRA_LINK_LTO=( $LDK_C_BINDINGS_EXTRA_TARGET_LINK_LTO )
 
 if [ ${#EXTRA_TARGETS[@]} != ${#EXTRA_CCS[@]} ]; then
        echo "LDK_C_BINDINGS_EXTRA_TARGETS and LDK_C_BINDINGS_EXTRA_TARGET_CCS didn't have the same number of elements!"
@@ -579,7 +580,15 @@ for IDX in ${!EXTRA_TARGETS[@]}; do
        EXTRA_ENV_TARGET=$(echo "${EXTRA_TARGETS[$IDX]}" | sed 's/-/_/g')
        export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS"
        export CC_$EXTRA_ENV_TARGET=${EXTRA_CCS[$IDX]}
-       RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C lto -C linker=${EXTRA_CCS[$IDX]}" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target "${EXTRA_TARGETS[$IDX]}"
+       EXTRA_RUSTFLAGS=""
+       case "$EXTRA_ENV_TARGET" in
+               "x86_64"*)
+                       export CFLAGS_$EXTRA_ENV_TARGET="$BASE_CFLAGS -march=sandybridge -mtune=sandybridge"
+                       EXTRA_RUSTFLAGS="-C target-cpu=sandybridge"
+                       ;;
+       esac
+       [ "${EXTRA_LINK_LTO[$IDX]}" != "" ] && EXTRA_RUSTFLAGS="-C linker-plugin-lto"
+       RUSTFLAGS="$BASE_RUSTFLAGS -C embed-bitcode=yes -C lto -C linker=${EXTRA_CCS[$IDX]} $EXTRA_RUSTFLAGS" CARGO_PROFILE_RELEASE_LTO=true cargo build $CARGO_BUILD_ARGS -v --release --target "${EXTRA_TARGETS[$IDX]}"
 done
 
 if [ "$CLANGPP" != "" -a "$LLD" != "" ]; then

diff --git a/lightning-c-bindings/demo.cpp b/lightning-c-bindings/demo.cpp
index 9cc3dc5f34991706c934f491a550fdca43f1dba0..f9284ee3cb9f377ba1240258d31490218b0a5d77 100644 (file)
--- a/lightning-c-bindings/demo.cpp
+++ b/lightning-c-bindings/demo.cpp
@@ -1112,7 +1112,8 @@ int main() {
        LDK::RecipientOnionFields invoice2_recipient(std::move(pay_params->contents.result->b));
        LDK::RouteParameters invoice2_params(std::move(pay_params->contents.result->c));
        assert(pay_params->result_ok);
-       LDKThirtyTwoBytes payment_id { .data = 0 };
+       LDKThirtyTwoBytes payment_id;
+       memset(&payment_id, 0, 32);
        LDK::CResult_NoneRetryableSendFailureZ invoice_pay_res = ChannelManager_send_payment(
                &cm1, std::move(pay_params->contents.result->a), std::move(invoice2_recipient),
                std::move(payment_id), std::move(invoice2_params), Retry_attempts(0)