From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 9 Feb 2024 01:30:03 +0000 (+0000)
Subject: Merge pull request #119 from arik-so/arik/2024/01/skip-tests-option
X-Git-Tag: v0.0.121.2^0
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=46fda3feee34f3ee2be2d57f18301080da439ac7;hp=385e34e3c089ce3c8fdc955af2081153cf33d9c9;p=ldk-c-bindings

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 31bb028..6c925dd 100755
--- 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 1c5fd52..b7ae371 100755
--- 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 9cc3dc5..f9284ee 100644
--- 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)