Skip to content

Commit 05bd68c

Browse files
committed
ctest: mac: improve fixture startup delay
Co-developed-by: Gemini 2.5 Pro
1 parent 266158c commit 05bd68c

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

.sai.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
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 && 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",
17+
"cd build && LD_LIBRARY_PATH=lib ctest -j$SAI_PARALLEL --output-on-failure --repeat until-pass:3",
1818
"cd build && SAI_CPACK=\"-G ZIP\" ${cpack}"
1919
]
2020
},
@@ -61,8 +61,8 @@
6161
"freertos-espidf/xl6-esp32/gcc": {
6262
"default": false,
6363
"build": [
64-
"rm -rf ebuild ; mkdir ebuild; cd ebuild;cp -rp ../minimal-examples/embedded/esp32/${cpack} . ; cd ${cpack} ; rm -f libwebsockets ; ln -sf ../.. libwebsockets && cp libwebsockets/minimal-examples/embedded/esp32/${cpack}/sdkconfig .",
65-
"cd ebuild/${cpack} ; . /opt/esp/esp-idf/export.sh ; idf.py set-target esp32 && mkdir -p build && cp sdkconfig.h build && idf.py ${cmake} build size size-components size-files",
64+
"rm -rf ebuild ; mkdir ebuild; cd ebuild;cp -rp ../minimal-examples/embedded/esp32/${cpack} . ; cd ${cpack} ; rm -f libwebsockets ; ln -sf ../../../.. libwebsockets && cp libwebsockets/minimal-examples/embedded/esp32/${cpack}/sdkconfig .",
65+
"cd ebuild/${cpack} ; . /opt/esp/esp-idf/export.sh ; rm -rf build ; idf.py set-target esp32 && cp partitions.csv sdkconfig.h build && cp -rp sdkconfig.old sdkconfig && idf.py ${cmake} build size size-components size-files",
6666
"cd ebuild/${cpack} && /usr/local/bin/sai-device ${cpack} ESPPORT=0 ctest --output-on-failure"
6767
]
6868
}

0 commit comments

Comments
 (0)