tests: get proof from test0025 stderr (and other minor fixes)

We were checking an empty proof because the test writes to stderr and we
were redirecting stdout to the file. With the correct redirection the hash
is different, so proof.answer is also adjusted.

The x86 test was calling blood-elf with the 64bits flag. Removed to ask for
32bits behaviour.

For consistency, --BaseAddress is now using the usual value for the arch.

Also, unused input file is removed here.

test/test.answers

@@ -142,9 +142,9 @@ deb80d26727f797c397b927938360f846eb982dc0722903cb07947737332c443  test/results/t
 4862ffbb8e6265bdbf3d5fd824f7b7581206a627f5e7fe83cf5b7f4b30b8ebd4  test/results/test0024-knight-posix-binary
 69c060eae9ffb12992d89eb02f066c517c5acfd1d9f80152e279fccce7b77f6a  test/results/test0024-x86-binary
 6d7909095cce3d94a439a9a54c7433aa2a53abc0d703731941aa29411252788d  test/results/test0025-aarch64-binary
-7b52bb0df9b63a80ee2040515c215d47fe31bc550c25feca7d0f5e2c69090070  test/results/test0025-amd64-binary
-22475767a4ecac73edfc760f770a335da62c2b3b71e591e2341d0173ff5308e1  test/results/test0025-armv7l-binary
-2b737bd6998686125c726e0fc5cd3c52ce39fbc93666772b25ec2f116c71690f  test/results/test0025-x86-binary
+6046b1622ad5e0519a23d777917d54c79473f2dcd0455f43bfa69f950f9a9292  test/results/test0025-amd64-binary
+82044e3e3b36092327094fe1aa4e14758207734987b546180dad2e2536d39aeb  test/results/test0025-armv7l-binary
+e7321aadf4dd89d34e5fe0ae3efd31b84488003b5caddd14443363b09d0af709  test/results/test0025-x86-binary
 28353f8a2c920af49a89a302d4910bd8df81a3147ca7c2c197fa5487ebb6d180  test/results/test0100-aarch64-binary
 4d4d7dc249a4fc1788f4443a7a5feba51392a73dc1b80297a510cbca41afd71e  test/results/test0100-amd64-binary
 98ebb4ac496ed255d769383d027b0bf358f280b248a0994b30c047d2d5506ec4  test/results/test0100-armv7l-binary

test/test0025/hello-aarch64.sh

@@ -68,7 +68,7 @@ if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "aarch64" ]
 then
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0025-aarch64-binary > test/test0025/proof || exit 4
+	./test/results/test0025-aarch64-binary 2>| test/test0025/proof || exit 4
 	out=$(sha256_check test/test0025/proof.answer)
 	[ "$out" = "test/test0025/proof: OK" ] || exit 5
 fi

test/test0025/hello-amd64.sh

@@ -57,7 +57,7 @@ hex2 \
 	-f ${TMPDIR}/array.hex2 \
 	--LittleEndian \
 	--architecture amd64 \
-	--BaseAddress 0x400000 \
+	--BaseAddress 0x00600000 \
 	-o test/results/test0025-amd64-binary \
 	--exec_enable \
 	|| exit 3
@@ -67,7 +67,7 @@ if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "amd64" ]
 then
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0025-amd64-binary > test/test0025/proof || exit 4
+	./test/results/test0025-amd64-binary 2>| test/test0025/proof || exit 4
 	out=$(sha256_check test/test0025/proof.answer)
 	[ "$out" = "test/test0025/proof: OK" ] || exit 5
 fi

test/test0025/hello-armv7l.sh

@@ -57,7 +57,7 @@ hex2 \
 	-f ${TMPDIR}/array.hex2 \
 	--LittleEndian \
 	--architecture armv7l \
-	--BaseAddress 0x400000 \
+	--BaseAddress 0x10000 \
 	-o test/results/test0025-armv7l-binary \
 	--exec_enable \
 	|| exit 3
@@ -67,7 +67,7 @@ if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "armv7l" ]
 then
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0025-armv7l-binary > test/test0025/proof || exit 4
+	./test/results/test0025-armv7l-binary 2>| test/test0025/proof || exit 4
 	out=$(sha256_check test/test0025/proof.answer)
 	[ "$out" = "test/test0025/proof: OK" ] || exit 5
 fi

test/test0025/hello-x86.sh

@@ -35,7 +35,6 @@ bin/M2-Planet \
 
 # Build debug footer
 blood-elf \
-	--64 \
 	-f ${TMPDIR}/array.M1 \
 	--entry _start \
 	-o ${TMPDIR}/array-footer.M1 \
@@ -58,7 +57,7 @@ hex2 \
 	-f ${TMPDIR}/array.hex2 \
 	--LittleEndian \
 	--architecture x86 \
-	--BaseAddress 0x400000 \
+	--BaseAddress 0x8048000 \
 	-o test/results/test0025-x86-binary \
 	--exec_enable \
 	|| exit 3
@@ -68,7 +67,7 @@ if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "x86" ]
 then
 	. ./sha256.sh
 	# Verify that the resulting file works
-	./test/results/test0025-x86-binary > test/test0025/proof || exit 4
+	./test/results/test0025-x86-binary 2>| test/test0025/proof || exit 4
 	out=$(sha256_check test/test0025/proof.answer)
 	[ "$out" = "test/test0025/proof: OK" ] || exit 5
 fi

test/test0025/proof.answer

@@ -1 +1 @@
-e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855  test/test0025/proof
+da2477e06f75a0c35df347bfddee55bab131a00cc47137ce541a027ad49978d9  test/test0025/proof