tests: prettier scripts

One line per flag for multi-line "Verify that the resulting file works"
calls; for coherency with 3aa8327334
This commit is contained in:
deesix 2021-01-23 00:00:00 +01:00
parent f2094a9e5b
commit 52b638f48f
15 changed files with 79 additions and 55 deletions

View File

@ -78,12 +78,13 @@ then
. ./sha256.sh
# Verify that the resulting file works
./test/results/test0101-aarch64-binary \
-f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof || exit 7
-f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof \
|| exit 7
out=$(sha256_check test/test0101/proof.answer)
[ "$out" = "test/test0101/proof: OK" ] || exit 8
fi

View File

@ -77,12 +77,14 @@ then
. ./sha256.sh
# Verify that the resulting file works
./test/results/test0101-amd64-binary -f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof || exit 7
./test/results/test0101-amd64-binary \
-f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof \
|| exit 7
out=$(sha256_check test/test0101/proof.answer)
[ "$out" = "test/test0101/proof: OK" ] || exit 8
fi

View File

@ -76,12 +76,14 @@ then
. ./sha256.sh
# Verify that the resulting file works
./test/results/test0101-armv7l-binary -f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof || exit 7
./test/results/test0101-armv7l-binary \
-f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof \
|| exit 7
out=$(sha256_check test/test0101/proof.answer)
[ "$out" = "test/test0101/proof: OK" ] || exit 8
fi

View File

@ -66,12 +66,14 @@ then
. ./sha256.sh
# Verify that the resulting file works
./test/results/test0101-knight-posix-binary -f test/common_x86/ELF-i386.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof || exit 7
./test/results/test0101-knight-posix-binary \
-f test/common_x86/ELF-i386.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof \
|| exit 7
out=$(sha256_check test/test0101/proof.answer)
[ "$out" = "test/test0101/proof: OK" ] || exit 8
fi

View File

@ -76,12 +76,14 @@ then
. ./sha256.sh
# Verify that the resulting file works
./test/results/test0101-x86-binary -f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof || exit 7
./test/results/test0101-x86-binary \
-f M2libc/x86/ELF-x86.hex2 \
-f test/test0101/test.hex2 \
--LittleEndian \
--architecture x86 \
--BaseAddress 0x8048000 \
-o test/test0101/proof \
|| exit 7
out=$(sha256_check test/test0101/proof.answer)
[ "$out" = "test/test0101/proof: OK" ] || exit 8
fi

View File

@ -78,13 +78,14 @@ then
[ "$out" = "M1 1.0.0" ] || exit 6
# Verify that the resulting file works
./test/results/test0102-aarch64-binary -f \
M2libc/x86/x86_defs.M1 \
./test/results/test0102-aarch64-binary \
-f M2libc/x86/x86_defs.M1 \
-f M2libc/x86/libc-core.M1 \
-f test/test0100/test.M1 \
--LittleEndian \
--architecture x86 \
-o test/test0102/proof || exit 7
-o test/test0102/proof \
|| exit 7
. ./sha256.sh
out=$(sha256_check test/test0102/proof.answer)

View File

@ -78,13 +78,14 @@ then
[ "$out" = "M1 1.0.0" ] || exit 6
# Verify that the resulting file works
./test/results/test0102-amd64-binary -f \
M2libc/x86/x86_defs.M1 \
./test/results/test0102-amd64-binary \
-f M2libc/x86/x86_defs.M1 \
-f M2libc/x86/libc-core.M1 \
-f test/test0100/test.M1 \
--LittleEndian \
--architecture x86 \
-o test/test0102/proof || exit 7
-o test/test0102/proof \
|| exit 7
. ./sha256.sh
out=$(sha256_check test/test0102/proof.answer)

View File

@ -77,13 +77,14 @@ then
[ "$out" = "M1 1.0.0" ] || exit 6
# Verify that the resulting file works
./test/results/test0102-armv7l-binary -f \
M2libc/x86/x86_defs.M1 \
./test/results/test0102-armv7l-binary \
-f M2libc/x86/x86_defs.M1 \
-f M2libc/x86/libc-core.M1 \
-f test/test0100/test.M1 \
--LittleEndian \
--architecture x86 \
-o test/test0102/proof || exit 7
-o test/test0102/proof \
|| exit 7
. ./sha256.sh
out=$(sha256_check test/test0102/proof.answer)

View File

@ -67,13 +67,14 @@ then
[ "$out" = "M1 1.0.0" ] || exit 6
# Verify that the resulting file works
./test/results/test0102-knight-posix-binary -f \
test/common_x86/x86_defs.M1 \
./test/results/test0102-knight-posix-binary \
-f test/common_x86/x86_defs.M1 \
-f test/common_x86/libc-core.M1 \
-f test/test0100/test.M1 \
--LittleEndian \
--architecture x86 \
-o test/test0102/proof || exit 7
-o test/test0102/proof \
|| exit 7
. ./sha256.sh
out=$(sha256_check test/test0102/proof.answer)

View File

@ -77,13 +77,14 @@ then
[ "$out" = "M1 1.0.0" ] || exit 6
# Verify that the resulting file works
./test/results/test0102-x86-binary -f \
M2libc/x86/x86_defs.M1 \
./test/results/test0102-x86-binary \
-f M2libc/x86/x86_defs.M1 \
-f M2libc/x86/libc-core.M1 \
-f test/test0100/test.M1 \
--LittleEndian \
--architecture x86 \
-o test/test0102/proof || exit 7
-o test/test0102/proof \
|| exit 7
. ./sha256.sh
out=$(sha256_check test/test0102/proof.answer)

View File

@ -83,7 +83,8 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "aarch64" ]
then
# Verify that the resulting file works
./test/results/test1000-aarch64-binary --architecture x86 \
./test/results/test1000-aarch64-binary \
--architecture x86 \
-f test/common_x86/functions/file.c \
-f test/common_x86/functions/malloc.c \
-f functions/calloc.c \
@ -104,7 +105,8 @@ then
-f cc_macro.c \
-f cc.c \
--bootstrap-mode \
-o test/test1000/proof || exit 5
-o test/test1000/proof \
|| exit 5
. ./sha256.sh
out=$(sha256_check test/test1000/proof.answer)

View File

@ -83,7 +83,8 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "amd64" ]
then
# Verify that the resulting file works
./test/results/test1000-amd64-binary --architecture x86 \
./test/results/test1000-amd64-binary \
--architecture x86 \
-f test/common_x86/functions/file.c \
-f test/common_x86/functions/malloc.c \
-f functions/calloc.c \
@ -104,7 +105,8 @@ then
-f cc_macro.c \
-f cc.c \
--bootstrap-mode \
-o test/test1000/proof || exit 5
-o test/test1000/proof \
|| exit 5
. ./sha256.sh
out=$(sha256_check test/test1000/proof.answer)

View File

@ -82,7 +82,8 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "armv7l" ]
then
# Verify that the resulting file works
./test/results/test1000-armv7l-binary --architecture x86 \
./test/results/test1000-armv7l-binary \
--architecture x86 \
-f test/common_x86/functions/file.c \
-f test/common_x86/functions/malloc.c \
-f functions/calloc.c \
@ -103,7 +104,8 @@ then
-f cc_macro.c \
-f cc.c \
--bootstrap-mode \
-o test/test1000/proof || exit 5
-o test/test1000/proof \
|| exit 5
. ./sha256.sh
out=$(sha256_check test/test1000/proof.answer)

View File

@ -74,7 +74,8 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "knight*" ]
then
# Verify that the resulting file works
./test/results/test1000-knight-posix-binary --architecture x86 \
./test/results/test1000-knight-posix-binary \
--architecture x86 \
-f test/common_x86/functions/file.c \
-f test/common_x86/functions/malloc.c \
-f functions/calloc.c \
@ -95,7 +96,8 @@ then
-f cc_macro.c \
-f cc.c \
--bootstrap-mode \
-o test/test1000/proof || exit 4
-o test/test1000/proof \
|| exit 4
. ./sha256.sh
out=$(sha256_check test/test1000/proof.answer)

View File

@ -82,7 +82,8 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "x86" ]
then
# Verify that the resulting file works
./test/results/test1000-x86-binary --architecture x86 \
./test/results/test1000-x86-binary \
--architecture x86 \
-f test/common_x86/functions/file.c \
-f test/common_x86/functions/malloc.c \
-f functions/calloc.c \
@ -103,7 +104,8 @@ then
-f cc_macro.c \
-f cc.c \
--bootstrap-mode \
-o test/test1000/proof || exit 5
-o test/test1000/proof \
|| exit 5
. ./sha256.sh
out=$(sha256_check test/test1000/proof.answer)