diff --git a/.sai.json b/.sai.json index b86e9a081..6a89b9cb4 100644 --- a/.sai.json +++ b/.sai.json @@ -84,7 +84,7 @@ "build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;cmake .. ${cmake} && make -j3 && make -j3 DESTDIR=../destdir install" }, "netbsd/aarch64BE-bcm2837-a53/gcc": { - "build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;cmake .. ${cmake};make -j4 && make -j4 DESTDIR=../destdir install", + "build": "mkdir build destdir;cd build;export CCACHE_DISABLE=1;cmake .. ${cmake};make -j6 && make -j6 DESTDIR=../destdir install && /usr/pkg/bin/ctest -j4 --output-on-failure", "default": false } }, @@ -147,7 +147,7 @@ }, "secure-streams-proxy": { "cmake": "-DLWS_WITH_SECURE_STREAMS=1 -DLWS_WITH_SECURE_STREAMS_PROXY_API=1 -DLWS_WITH_MINIMAL_EXAMPLES=1", - "platforms": "not windows-10/x86_64-amd/msvc" + "platforms": "not windows-10/x86_64-amd/msvc, netbsd/aarch64BE-bcm2837-a53/gcc" }, "distro_recommended": { # minimal examples also needed for ctest "cmake": "-DLWS_WITH_DISTRO_RECOMMENDED=1 -DLWS_WITH_MINIMAL_EXAMPLES=1", diff --git a/lib/tls/CMakeLists.txt b/lib/tls/CMakeLists.txt index d12b56901..1ea42d373 100644 --- a/lib/tls/CMakeLists.txt +++ b/lib/tls/CMakeLists.txt @@ -416,7 +416,7 @@ if (GENCERTS) if (CMAKE_HOST_SYSTEM_NAME MATCHES "NetBSD") execute_process( COMMAND "${OPENSSL_EXECUTABLE}" - req -new -newkey rsa:2048 -days 10000 -nodes -x509 -subj "/O=lws" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}" + req -new -newkey rsa:2048 -days 10000 -nodes -x509 -subj "/O=lws/CN=localhost" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}" RESULT_VARIABLE OPENSSL_RETURN_CODE # OUTPUT_QUIET ERROR_QUIET ) diff --git a/scripts/ctest-background-kill.sh b/scripts/ctest-background-kill.sh index 36e840962..b996a9fd6 100755 --- a/scripts/ctest-background-kill.sh +++ b/scripts/ctest-background-kill.sh @@ -39,8 +39,17 @@ if [ $GONESKI -eq 0 ] ; then A2=$2 fi + PSARGS=-Af + Q=`ps -f` + + if [ $? -ne 0 ] ; then + PSARGS=`-dAww` + fi + + ps $PSARGS >> /tmp/ctklog + # sed is there to match up bsd/osx ps with linux - KL=`ps -Af | grep -v ctest-background-kill | grep -v grep | grep $2 | grep $A1 | grep $A2 | tr -s ' ' | sed "s/^\ //g" | cut -d' ' -f2` + KL=`ps $PSARGS | grep -v ctest-background-kill | grep -v grep | grep $2 | grep $A1 | grep $A2 | tr -s ' ' | sed "s/^\ //g" | cut -d' ' -f2` if [ ! -z "$KL" ] ; then echo "Stage 2 kill $J 'kill $KL'" >> /tmp/ctklog kill $KL 2>&1 >> /tmp/ctklog