From 0ba47de779032dfb5d6a3587a17fcc31e1e659f9 Mon Sep 17 00:00:00 2001 From: Arik Sosman Date: Tue, 30 Jan 2024 13:16:22 -0800 Subject: [PATCH 1/3] Create an option to skip tests. --- genbindings.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/genbindings.sh b/genbindings.sh index fd797d7..bdf3794 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -9,6 +9,18 @@ if [ ! -d "$1/lightning" -o "$2" != "true" -a "$2" != "false" ]; then exit 1 fi +SKIP_TESTS_ARGUMENT=$3 +SKIP_TESTS=false + +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 + fi +fi + export LC_ALL=C # On reasonable systems, we can use realpath here, but OSX is a diva with 20-year-old software. @@ -249,6 +261,11 @@ else sed -i '' 's/#include /#include "ldk_rust_types.h"/g' include/lightning.h fi +if $SKIP_TESTS; then + echo "Skipping tests!" + exit 0 +fi + # Build C++ class methods which call trait methods echo "Updating C++ header, this may take some time, especially on macOS" set +x # Echoing every command is very verbose here From 09b9f4778e94e1396be3c36c6a9bee94d35d0f8c Mon Sep 17 00:00:00 2001 From: Arik Sosman Date: Sun, 4 Feb 2024 22:04:56 -0800 Subject: [PATCH 2/3] Move test-skipping effect to be prior to sanity- checking and running the gcc app. --- genbindings.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/genbindings.sh b/genbindings.sh index bdf3794..2074871 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -261,11 +261,6 @@ else sed -i '' 's/#include /#include "ldk_rust_types.h"/g' include/lightning.h fi -if $SKIP_TESTS; then - echo "Skipping tests!" - exit 0 -fi - # Build C++ class methods which call trait methods echo "Updating C++ header, this may take some time, especially on macOS" set +x # Echoing every command is very verbose here @@ -334,6 +329,11 @@ export IFS="$OLD_IFS" set -x mv include/lightningpp_new.hpp include/lightningpp.hpp +if $SKIP_TESTS; then + echo "Skipping tests!" + exit 0 +fi + # 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 From 385e34e3c089ce3c8fdc955af2081153cf33d9c9 Mon Sep 17 00:00:00 2001 From: Arik Sosman Date: Tue, 6 Feb 2024 17:51:31 -0800 Subject: [PATCH 3/3] Run cargo commands when skipping tests. --- genbindings.sh | 72 +++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/genbindings.sh b/genbindings.sh index 2074871..1c5fd52 100755 --- 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 {