cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync wasi-test-wrapper.sh and wintest.bat

Browse Source
This commit is contained in:
Frank Denis 2023-09-09 12:50:51 +02:00
parent ac14901c30
commit 1bafad7899
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/default/wasi-test-wrapper.sh
View File

@ -9,7 +9,7 @@ fi
if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "wasmedge" ]; then
if command -v wasmedgec >/dev/null && command -v wasmedge >/dev/null; then
wasmedgec "$1" "${1}.so" &&
wasmedgec "$1" "${1}.so" >/dev/null &&
wasmedge --dir=.:. "${1}.so" &&
rm -f "${1}.so" &&
exit 0
@ -28,12 +28,6 @@ if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "wasmtime" ]; then
fi
fi
if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "wavm" ]; then
if command -v wavm >/dev/null; then
wavm run --abi=wasi "$1" && exit 0
fi
fi
if [ -z "$WASI_RUNTIME" ] || [ "$WASI_RUNTIME" = "bun" ]; then
if echo | bun help >/dev/null 2>&1; then
{

17
test/default/wintest.bat
View File

@ -1,7 +1,7 @@
@ECHO OFF
if "%1" == "" (
echo "Usage: wintest.bat <Release | ReleaseDLL | Debug | DebugDLL"
echo "Usage: wintest.bat <Release | ReleaseDLL | Debug | DebugDLL> [ <x64 | ARM64> ]"
goto :END
)
@ -13,7 +13,8 @@ if not exist sodium_version.c (
)
)
if "%2" == "x64" (SET ARCH=x64) else (SET ARCH=Win32)
if "%2" == "x64" (SET ARCH=x64) else if "%2" == "ARM64" (SET ARCH=ARM64) else (SET ARCH=ARM64)
if "%2" == "ARM64" (SET CROSSCOMPILE=1) else (SET CROSSCOMPILE=0)
SET CFLAGS=/nologo /DTEST_SRCDIR=\".\" /I..\..\src\libsodium\include\sodium /I..\..\src\libsodium\include /I..\quirks
SET LDFLAGS=/link /LTCG advapi32.lib ..\..\Build\%1\%ARCH%\libsodium.lib
if "%1" == "ReleaseDLL" ( goto :ReleaseDLL )
@ -44,11 +45,15 @@ FOR %%f in (*.c) DO (
echo %%f compile failed
goto :END
)
%%f.exe
if errorlevel 1 (
echo %%f failed
if %CROSSCOMPILE% == 1 (
echo %%f skipped
) else (
echo %%f ok
%%f.exe
if errorlevel 1 (
echo %%f failed
) else (
echo %%f ok
)
)
)
REM Remove temporary files