andrius
/
M2-Planet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

@@@ ARCH_IS_64_BITS 

In three scripts, we need to adjust the expected value check depending on
the word size of the arch.

We do it based on a this new var.
This commit is contained in:
deesix 2021-01-31 00:00:00 +01:00
parent 3400296b9b
commit dd67ccddce
5 changed files with 82 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
makefile-tests
View File

@ -576,205 +576,205 @@ test0106-knight-native-binary: M2-Planet | results
test/test0106/hello-knight-native.sh
test0000-armv7l-binary: M2-Planet | results
test/test0000/hello-armv7l.sh
test/test0000/run_test.sh armv7l
test0001-armv7l-binary: M2-Planet | results
test/test0001/hello-armv7l.sh
test/test0001/run_test.sh armv7l
test0002-armv7l-binary: M2-Planet | results
test/test0002/hello-armv7l.sh
test/test0002/run_test.sh armv7l
test0003-armv7l-binary: M2-Planet | results
test/test0003/hello-armv7l.sh
test/test0003/run_test.sh armv7l
test0004-armv7l-binary: M2-Planet | results
test/test0004/hello-armv7l.sh
test/test0004/run_test.sh armv7l
test0005-armv7l-binary: M2-Planet | results
test/test0005/hello-armv7l.sh
test/test0005/run_test.sh armv7l
test0006-armv7l-binary: M2-Planet | results
test/test0006/hello-armv7l.sh
test/test0006/run_test.sh armv7l
test0007-armv7l-binary: M2-Planet | results
test/test0007/hello-armv7l.sh
test/test0007/run_test.sh armv7l
test0008-armv7l-binary: M2-Planet | results
test/test0008/hello-armv7l.sh
test/test0008/run_test.sh armv7l
test0009-armv7l-binary: M2-Planet | results
test/test0009/hello-armv7l.sh
test/test0009/run_test.sh armv7l
test0010-armv7l-binary: M2-Planet | results
test/test0010/hello-armv7l.sh
test/test0010/run_test.sh armv7l
test0011-armv7l-binary: M2-Planet | results
test/test0011/hello-armv7l.sh
test/test0011/run_test.sh armv7l
test0012-armv7l-binary: M2-Planet | results
test/test0012/hello-armv7l.sh
test/test0012/run_test.sh armv7l
test0013-armv7l-binary: M2-Planet | results
test/test0013/hello-armv7l.sh
test/test0013/run_test.sh armv7l
test0014-armv7l-binary: M2-Planet | results
test/test0014/hello-armv7l.sh
test/test0014/run_test.sh armv7l
test0015-armv7l-binary: M2-Planet | results
test/test0015/hello-armv7l.sh
test/test0015/run_test.sh armv7l
test0016-armv7l-binary: M2-Planet | results
test/test0016/hello-armv7l.sh
test/test0016/run_test.sh armv7l
test0017-armv7l-binary: M2-Planet | results
test/test0017/hello-armv7l.sh
test/test0017/run_test.sh armv7l
test0018-armv7l-binary: M2-Planet | results
test/test0018/hello-armv7l.sh
test/test0018/run_test.sh armv7l
test0019-armv7l-binary: M2-Planet | results
test/test0019/hello-armv7l.sh
test/test0019/run_test.sh armv7l
test0020-armv7l-binary: M2-Planet | results
test/test0020/hello-armv7l.sh
test/test0020/run_test.sh armv7l
test0021-armv7l-binary: M2-Planet | results
test/test0021/hello-armv7l.sh
test/test0021/run_test.sh armv7l
test0022-armv7l-binary: M2-Planet | results
test/test0022/hello-armv7l.sh
test/test0022/run_test.sh armv7l
test0023-armv7l-binary: M2-Planet | results
test/test0023/hello-armv7l.sh
test/test0023/run_test.sh armv7l
test0024-armv7l-binary: M2-Planet | results
test/test0024/hello-armv7l.sh
test/test0024/run_test.sh armv7l
test0025-armv7l-binary: M2-Planet | results
test/test0025/hello-armv7l.sh
test/test0025/run_test.sh armv7l
test0100-armv7l-binary: M2-Planet | results
test/test0100/hello-armv7l.sh
test/test0100/run_test.sh armv7l
test0101-armv7l-binary: M2-Planet | results
test/test0101/hello-armv7l.sh
test/test0101/run_test.sh armv7l
test0102-armv7l-binary: M2-Planet | results
test/test0102/hello-armv7l.sh
test/test0102/run_test.sh armv7l
test0103-armv7l-binary: M2-Planet | results
test/test0103/hello-armv7l.sh
test/test0103/run_test.sh armv7l
test0104-armv7l-binary: M2-Planet | results
test/test0104/hello-armv7l.sh
test/test0104/run_test.sh armv7l
test0105-armv7l-binary: M2-Planet | results
test/test0105/hello-armv7l.sh
test/test0105/run_test.sh armv7l
test0106-armv7l-binary: M2-Planet | results
test/test0106/hello-armv7l.sh
test/test0106/run_test.sh armv7l
test1000-armv7l-binary: M2-Planet | results
test/test1000/hello-armv7l.sh
test0000-x86-binary: M2-Planet | results
test/test0000/hello-x86.sh
test/test0000/run_test.sh x86
test0001-x86-binary: M2-Planet | results
test/test0001/hello-x86.sh
test/test0001/run_test.sh x86
test0002-x86-binary: M2-Planet | results
test/test0002/hello-x86.sh
test/test0002/run_test.sh x86
test0003-x86-binary: M2-Planet | results
test/test0003/hello-x86.sh
test/test0003/run_test.sh x86
test0004-x86-binary: M2-Planet | results
test/test0004/hello-x86.sh
test/test0004/run_test.sh x86
test0005-x86-binary: M2-Planet | results
test/test0005/hello-x86.sh
test/test0005/run_test.sh x86
test0006-x86-binary: M2-Planet | results
test/test0006/hello-x86.sh
test/test0006/run_test.sh x86
test0007-x86-binary: M2-Planet | results
test/test0007/hello-x86.sh
test/test0007/run_test.sh x86
test0008-x86-binary: M2-Planet | results
test/test0008/hello-x86.sh
test/test0008/run_test.sh x86
test0009-x86-binary: M2-Planet | results
test/test0009/hello-x86.sh
test/test0009/run_test.sh x86
test0010-x86-binary: M2-Planet | results
test/test0010/hello-x86.sh
test/test0010/run_test.sh x86
test0011-x86-binary: M2-Planet | results
test/test0011/hello-x86.sh
test/test0011/run_test.sh x86
test0012-x86-binary: M2-Planet | results
test/test0012/hello-x86.sh
test/test0012/run_test.sh x86
test0013-x86-binary: M2-Planet | results
test/test0013/hello-x86.sh
test/test0013/run_test.sh x86
test0014-x86-binary: M2-Planet | results
test/test0014/hello-x86.sh
test/test0014/run_test.sh x86
test0015-x86-binary: M2-Planet | results
test/test0015/hello-x86.sh
test/test0015/run_test.sh x86
test0016-x86-binary: M2-Planet | results
test/test0016/hello-x86.sh
test/test0016/run_test.sh x86
test0017-x86-binary: M2-Planet | results
test/test0017/hello-x86.sh
test/test0017/run_test.sh x86
test0018-x86-binary: M2-Planet | results
test/test0018/hello-x86.sh
test/test0018/run_test.sh x86
test0019-x86-binary: M2-Planet | results
test/test0019/hello-x86.sh
test/test0019/run_test.sh x86
test0020-x86-binary: M2-Planet | results
test/test0020/hello-x86.sh
test/test0020/run_test.sh x86
test0021-x86-binary: M2-Planet | results
test/test0021/hello-x86.sh
test/test0021/run_test.sh x86
test0022-x86-binary: M2-Planet | results
test/test0022/hello-x86.sh
test/test0022/run_test.sh x86
test0023-x86-binary: M2-Planet | results
test/test0023/hello-x86.sh
test/test0023/run_test.sh x86
test0024-x86-binary: M2-Planet | results
test/test0024/hello-x86.sh
test/test0024/run_test.sh x86
test0025-x86-binary: M2-Planet | results
test/test0025/hello-x86.sh
test/test0025/run_test.sh x86
test0100-x86-binary: M2-Planet | results
test/test0100/hello-x86.sh
test/test0100/run_test.sh x86
test0101-x86-binary: M2-Planet | results
test/test0101/hello-x86.sh
test/test0101/run_test.sh x86
test0102-x86-binary: M2-Planet | results
test/test0102/hello-x86.sh
test/test0102/run_test.sh x86
test0103-x86-binary: M2-Planet | results
test/test0103/hello-x86.sh
test/test0103/run_test.sh x86
test0104-x86-binary: M2-Planet | results
test/test0104/hello-x86.sh
test/test0104/run_test.sh x86
test0105-x86-binary: M2-Planet | results
test/test0105/hello-x86.sh
test/test0105/run_test.sh x86
test0106-x86-binary: M2-Planet | results
test/test0106/hello-x86.sh
test/test0106/run_test.sh x86
test1000-x86-binary: M2-Planet | results
test/test1000/hello-x86.sh

4
test/env.inc.sh
View File

@ -18,21 +18,25 @@
case "${ARCH}" in
aarch64)
ARCH_IS_64_BITS="yes"
BASE_ADDRESS="0x00400000"
BLOOD_ELF_WORD_SIZE_FLAG="--64"
ENDIANNESS_FLAG="--little-endian"
;;
amd64)
ARCH_IS_64_BITS="yes"
BASE_ADDRESS="0x00600000"
BLOOD_ELF_WORD_SIZE_FLAG="--64"
ENDIANNESS_FLAG="--little-endian"
;;
armv7l)
ARCH_IS_64_BITS="no"
BASE_ADDRESS="0x00010000"
BLOOD_ELF_WORD_SIZE_FLAG=""
ENDIANNESS_FLAG="--little-endian"
;;
x86)
ARCH_IS_64_BITS="no"
BASE_ADDRESS="0x08048000"
BLOOD_ELF_WORD_SIZE_FLAG=""
ENDIANNESS_FLAG="--little-endian"

5
test/test0008/run_test.sh
View File

@ -69,8 +69,11 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "${ARCH}" ]
then
# Verify that the compiled program returns the correct result
EXPECTED=16
[ "yes" = "${ARCH_IS_64_BITS}" ] && EXPECTED=32
out=$(./test/results/test0008-${ARCH}-binary 2>&1 )
[ 32 = $? ] || exit 4
[ ${EXPECTED} = $? ] || exit 4
[ "$out" = "35419896642975313541989657891634" ] || exit 5
fi
exit 0

5
test/test0010/run_test.sh
View File

@ -59,8 +59,11 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "${ARCH}" ]
then
# Verify that the compiled program returns the correct result
EXPECTED=12
[ "yes" = "${ARCH_IS_64_BITS}" ] && EXPECTED=24
out=$(./test/results/test0010-${ARCH}-binary 2>&1 )
[ 24 = $? ] || exit 4
[ ${EXPECTED} = $? ] || exit 4
[ "$out" = "35419896642975313541989657891634" ] || exit 5
fi
exit 0

5
test/test0020/run_test.sh
View File

@ -59,8 +59,11 @@ hex2 \
if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "${ARCH}" ]
then
# Verify that the compiled program returns the correct result
EXPECTED=20
[ "yes" = "${ARCH_IS_64_BITS}" ] && EXPECTED=40
out=$(./test/results/test0020-${ARCH}-binary 2>&1 )
[ 40 = $? ] || exit 4
[ ${EXPECTED} = $? ] || exit 4
[ "$out" = "35419896642975313541989657891634" ] || exit 5
fi
exit 0