Merge new tests

Merge new tests

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
2021-08-26 20:47:28 +02:00
parent 80679fdfa2
commit b1608a889b
4 changed files with 429 additions and 72 deletions

View File

@ -5,7 +5,7 @@ if (( $# >= 1 )); then
build_file=build-${image%:*}
shift 1
cmake_arg=$*
cmake_arg=$@
echo "cmake arg: $cmake_arg"
#echo "Pulling dockcross/$image"
@ -16,7 +16,7 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg"
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
./dockcross-"$image" ninja -C "$build_file"
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"

22
tools/dockcross-command.sh Executable file
View File

@ -0,0 +1,22 @@
#!/usr/bin/env bash
if (( $# >= 2 )); then
image=$1
shift 1
command=$@
echo "command: $command"
#echo "Pulling dockcross/$image"
#docker pull dockcross/"$image"
echo "Make script dockcross-$image"
docker run --rm dockcross/"$image" > ./dockcross-"$image"
chmod +x ./dockcross-"$image"
echo "Run command in dockcross-$image"
./dockcross-"$image" $command
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
exit 1
fi

View File

@ -5,7 +5,7 @@ if (( $# >= 1 )); then
build_file=build-${image%:*}
shift 1
make_arg=$*
make_arg=$@
echo "make arg: $make_arg"
#echo "Pulling dockcross/$image"
@ -16,7 +16,7 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC}' $make_arg
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
exit 1