Skip to content

Commit 4640136

Browse files
lws-teamlws-team
committed
sai.json: w11: adapt command
1 parent 0490dfd commit 4640136

File tree

3 files changed

+22
-23
lines changed

3 files changed

+22
-23
lines changed

‎.sai.json‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,39 @@
66
"build": [
77
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. ${cmake}",
88
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
9-
"cd build && ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
9+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
1010
"cd build && SAI_CPACK=\"-G RPM\" ${cpack}"
1111
]
1212
},
1313
"netbsd-OSX-bigsur/x86_64-intel-i3/llvm": {
1414
"build": [
1515
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib MACOSX_DEPLOYMENT_TARGET=12.5 cmake .. -DCMAKE_MAKE_PROGRAM=/usr/bin/make ${cmake}",
1616
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
17-
"cd build && ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
17+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
1818
"cd build && SAI_CPACK=\"-G ZIP\" ${cpack}"
1919
]
2020
},
2121
"ubuntu-noble/riscv64/gcc": {
2222
"build": [
2323
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. ${cmake}",
2424
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
25-
"cd build && ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
25+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
2626
"cd build && SAI_CPACK=\"-G DEB\" ${cpack}"
2727
]
2828
},
2929
"rocky9/x86_64-amd/gcc": {
3030
"build": [
3131
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. ${cmake}",
3232
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
33-
"cd build && ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
33+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
3434
"cd build && SAI_CPACK=\"-G RPM\" ${cpack}"
3535
]
3636
},
3737
"linux-ubuntu-2404/aarch64-a72-bcm2711-rpi4/gcc": {
3838
"build": [
3939
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. ${cmake}",
4040
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
41-
"cd build && ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
41+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
4242
"cd build && SAI_CPACK=\"-G DEB\" ${cpack}"
4343
]
4444
},
@@ -47,25 +47,24 @@
4747
"build": [
4848
"mkdir -p build destdir; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. ${cmake}",
4949
"cd build && make -j$SAI_PARALLEL && rm -rf ../destdir && make -j$SAI_PARALLEL DESTDIR=../destdir install",
50-
"cd build && /usr/pkg/bin/ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3"
50+
"cd build && LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib /usr/pkg/bin/ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3"
5151
]
5252
},
5353
"w11/x86_64-amd/msvc": {
5454
"default": false,
55-
"build": [
56-
"mkdir -p build; cd build; CCACHE_DISABLE=1 LD_LIBRARY_PATH=../destdir/usr/local/share/libwebsockets-test-server/plugins:../destdir/usr/local/lib cmake .. -DOPENSSL_ROOT_DIR=\"C:\\Users\\andy\\vcpkg\\packages\\openssl_x64-windows\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake}",
57-
"cd build && cmake --build . --config DEBUG",
58-
"cd build && /usr/pkg/bin/ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
59-
"cd build && SAI_CPACK=\"-G ZIP\" ${cpack}"
55+
"build": [
56+
"\"C:\\Program Files\\CMake\\bin\\cmake.exe\" -S . -B build -DOPENSSL_ROOT_DIR=\"C:\\Users\\andy\\vcpkg\\packages\\openssl_x64-windows\" -DLWS_EXT_PTHREAD_INCLUDE_DIR=\"C:\\Program Files (x86)\\pthreads\\include\" -DLWS_EXT_PTHREAD_LIBRARIES=\"C:\\Program Files (x86)\\pthreads\\lib\\x64\\libpthreadGC2.a\" ${cmake}",
57+
"\"C:\\Program Files\\CMake\\bin\\cmake.exe\" --build build --config DEBUG --parallel %SAI_PARALLEL%",
58+
"\"C:\\Program Files\\CMake\\bin\\ctest.exe\" --test-dir build -C DEBUG -j%SAI_PARALLEL% --output-on-failure --repeat until-pass:3"
6059
]
6160
},
6261
"freertos-espidf/xl6-esp32/gcc": {
6362
"default": false,
6463
"build": [
65-
"rm -rf ebuild ; mkdir ebuild; cd ebuild;cp -rp ../minimal-examples/embedded/esp32/${cpack} . ; cd ${cpack} ; rm -flibwebsockets ; ln -sf ../.. libwebsockets",
66-
"cp libwebsockets/minimal-examples/embedded/esp32/${cpack}/sdkconfig . && cp sdkconfig.h build",
67-
". /opt/esp/esp-idf/export.sh ; idf.py set-target esp32 && idf.py ${cmake} build size size-components size-files",
68-
"cd build && /usr/local/bin/sai-device ${cpack} ESPPORT=0 ctest --output-on-failure"
64+
"rm -rf ebuild ; mkdir ebuild; cd ebuild;cp -rp ../minimal-examples/embedded/esp32/${cpack} . ; cd ${cpack} ; rm -f libwebsockets ; ln -sf ../.. libwebsockets",
65+
"cd ebuild/${cpack} ; cp libwebsockets/minimal-examples/embedded/esp32/${cpack}/sdkconfig . && cp sdkconfig.h build",
66+
"cd ebuild/${cpack} ; . /opt/esp/esp-idf/export.sh ; idf.py set-target esp32 && idf.py ${cmake} build size size-components size-files",
67+
"cd ebuild/${cpack} && /usr/local/bin/sai-device ${cpack} ESPPORT=0 ctest --output-on-failure"
6968
]
7069
}
7170
},
@@ -169,16 +168,16 @@
169168
"cmake": "-DLWS_WITH_NETWORK=0"
170169
},
171170
"libev": {
172-
"cmake": "-DLWS_WITH_LIBEV=ON"
171+
"cmake": "-DLWS_WITH_LIBEV=ON -DLWS_WITH_PLUGINS=1"
173172
},
174173
"libevent": {
175-
"cmake": "-DLWS_WITH_LIBEVENT=ON"
174+
"cmake": "-DLWS_WITH_LIBEVENT=ON -DLWS_WITH_PLUGINS=1"
176175
},
177176
"libglib": {
178-
"cmake": "-DLWS_WITH_GLIB=ON"
177+
"cmake": "-DLWS_WITH_GLIB=ON -DLWS_WITH_PLUGINS=1"
179178
},
180179
"sdevent": {
181-
"cmake": "-DLWS_WITH_SDEVENT=ON",
180+
"cmake": "-DLWS_WITH_SDEVENT=ON -DLWS_WITH_PLUGINS=1",
182181
"platforms": "not netbsd-OSX-bigsur/x86_64-intel-i3/llvm"
183182
},
184183
"uncommon_headers": {

‎minimal-examples-lowlevel/http-client/minimal-http-client-multi/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ if (requirements)
3232
# instantiate the server per sai builder instance, they are running in the same
3333
# machine context in parallel so they can tread on each other otherwise
3434
#
35-
set(PORT_HCM_SRV "7670")
35+
set(PORT_HCM_SRV "6670")
3636
if ("$ENV{SAI_INSTANCE_IDX}")
37-
math(EXPR PORT_HCM_SRV "7671 + $ENV{SAI_INSTANCE_IDX}")
37+
math(EXPR PORT_HCM_SRV "6671 + $ENV{SAI_INSTANCE_IDX}")
3838
endif()
3939

4040
# hack

‎minimal-examples-lowlevel/http-client/minimal-http-client-post/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ if (requirements)
2828
# instantiate the server per sai builder instance, they are running in the same
2929
# machine context in parallel so they can tread on each other otherwise
3030
#
31-
set(PORT_HCP_SRV "7640")
31+
set(PORT_HCP_SRV "7040")
3232
if ("$ENV{SAI_INSTANCE_IDX}")
33-
math(EXPR PORT_HCP_SRV "7671 + $ENV{SAI_INSTANCE_IDX}")
33+
math(EXPR PORT_HCP_SRV "7041 + $ENV{SAI_INSTANCE_IDX}")
3434
endif()
3535

3636
# hack

0 commit comments

Comments
 (0)