Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

netbsdBE: enable ctest and fix test cert generation

Browse source 
NetBSD test server cert gen lacked a CN, add it for localhost

Enable Sai -j6 from -j4 for netbsdBE... it's slow but it is SMP

Add build in sai for secure-streams-proxy scenario
This commit is contained in:
Andy Green 2020-12-31 06:47:35 +00:00
parent abc60c755a
commit a8d6ac8923
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.sai.json
View file

@ -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",

2
lib/tls/CMakeLists.txt
View file

@ -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
)

11
scripts/ctest-background-kill.sh
View file

@ -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