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

[ldk-c-bindings] / genbindings.sh

diff --git a/genbindings.sh b/genbindings.sh
index 20748715be3f60009a95626ae5a04fbdf23bcdf6..b7ae3717c1008dcab9e2118f041c3b572b4f2dc4 100755 (executable)
--- a/genbindings.sh
+++ b/genbindings.sh
@@ -10,14 +10,14 @@ if [ ! -d "$1/lightning" -o "$2" != "true" -a "$2" != "false" ]; then
 fi
 
 SKIP_TESTS_ARGUMENT=$3
-SKIP_TESTS=false
+RUN_CPP_TESTS=true
 
 if [ ! -z "$SKIP_TESTS_ARGUMENT" ]; then
   if [ "$SKIP_TESTS_ARGUMENT" != "skip-tests" ]; then
     echo "To skip tests, usage must be: $0 path-to-rust-lightning allow-std skip-tests"
     exit 1
   else
-    SKIP_TESTS=true
+    RUN_CPP_TESTS=false
   fi
 fi
 
@@ -329,45 +329,45 @@ export IFS="$OLD_IFS"
 set -x
 mv include/lightningpp_new.hpp include/lightningpp.hpp
 
-if $SKIP_TESTS; then
-  echo "Skipping tests!"
-  exit 0
-fi
+if $RUN_CPP_TESTS; then
+  # Finally, sanity-check the generated C and C++ bindings with demo apps:
+  # Naively run the C demo app:
+  gcc $LOCAL_CFLAGS -Wall -g -pthread demo.c target/debug/libldk.a -ldl -lm
+  ./a.out
 
-# Finally, sanity-check the generated C and C++ bindings with demo apps:
-# Naively run the C demo app:
-gcc $LOCAL_CFLAGS -Wall -g -pthread demo.c target/debug/libldk.a -ldl -lm
-./a.out
+  # And run the C++ demo app
+  if [ "$2" = "true" ]; then
+    g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread demo.cpp -Ltarget/debug/ -lldk -ldl
+    LD_LIBRARY_PATH=target/debug/ ./a.out > /dev/null
+  fi
 
-# And run the C++ demo app
-if [ "$2" = "true" ]; then
-       g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread demo.cpp -Ltarget/debug/ -lldk -ldl
-       LD_LIBRARY_PATH=target/debug/ ./a.out > /dev/null
-fi
+  # Finally, run the C++ demo app with our native networking library
+  # in valgrind to test memory model correctness and lack of leaks.
+  gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o
+  if [ "$2" = "true" ]; then
+    g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm
+    if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then
+      valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out
+      echo
+    else
+      echo "WARNING: Please install valgrind for more testing"
+      ./a.out
+    fi
+  fi
 
-# Finally, run the C++ demo app with our native networking library
-# in valgrind to test memory model correctness and lack of leaks.
-gcc $LOCAL_CFLAGS -fPIC -std=c99 -Wall -g -pthread -I../ldk-net ../ldk-net/ldk_net.c -c -o ldk_net.o
-if [ "$2" = "true" ]; then
-       g++ $LOCAL_CFLAGS -std=c++11 -Wall -g -pthread -DREAL_NET -I../ldk-net ldk_net.o demo.cpp target/debug/libldk.a -ldl -lm
-       if [ -x "`which valgrind`" -a "$(uname -m)" != "ppc64le" ]; then
-               valgrind --error-exitcode=4 --memcheck:leak-check=full --show-leak-kinds=all ./a.out
-               echo
-       else
-               echo "WARNING: Please install valgrind for more testing"
-               ./a.out
-       fi
-fi
 
+  # Test a statically-linked C++ version, tracking the resulting binary size and runtime
+  # across debug, LTO, and cross-language LTO builds (using the same compiler each time).
+  if [ "$2" = "true" ]; then
+    clang++ $LOCAL_CFLAGS -std=c++11 demo.cpp target/debug/libldk.a -ldl
+    strip ./a.out
+    time ./a.out
+    echo " C++ Bin size and runtime w/o optimization:"
+    ls -lha a.out
+  fi
 
-# Test a statically-linked C++ version, tracking the resulting binary size and runtime
-# across debug, LTO, and cross-language LTO builds (using the same compiler each time).
-if [ "$2" = "true" ]; then
-       clang++ $LOCAL_CFLAGS -std=c++11 demo.cpp target/debug/libldk.a -ldl
-       strip ./a.out
-       time ./a.out
-       echo " C++ Bin size and runtime w/o optimization:"
-       ls -lha a.out
+else
+  echo "Skipping tests!"
 fi
 
 function REALLY_PIN_CC {
@@ -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