From ee1abde0d4353a836a562a51a8cd2324cbb43846 Mon Sep 17 00:00:00 2001 From: Jeremiah Orians Date: Sat, 23 Feb 2019 20:18:53 -0500 Subject: [PATCH] Add test2 for knight-posix --- CHANGELOG.org | 2 + makefile | 10 +++-- test/common_knight/functions/exit.c | 25 +++++++++++ test/common_knight/functions/putchar.c | 23 ++++++++++ .../common_x86/functions}/exit.c | 0 .../common_x86/functions}/putchar.c | 0 test/test.answers | 3 +- test/test01/hello-knight-posix.sh | 44 +++++++++++++++++++ test/test01/{hello.sh => hello-x86.sh} | 8 ++-- test/test02/hello.sh | 4 +- test/test03/hello.sh | 4 +- test/test04/hello.sh | 4 +- test/test05/hello.sh | 4 +- test/test06/hello.sh | 2 +- test/test07/hello.sh | 4 +- test/test08/hello.sh | 4 +- test/test09/hello.sh | 4 +- test/test10/hello.sh | 4 +- test/test100/hello.sh | 8 ++-- test/test11/hello.sh | 4 +- test/test12/hello.sh | 4 +- test/test13/hello.sh | 4 +- test/test14/hello.sh | 2 +- test/test15/hello.sh | 2 +- test/test16/hello.sh | 2 +- test/test17/hello.sh | 2 +- test/test19/hello.sh | 2 +- test/test20/hello.sh | 4 +- test/test21/hello.sh | 2 +- test/test22/hello.sh | 2 +- test/test23/hello.sh | 2 +- test/test24/hello.sh | 2 +- test/test25/hello.sh | 2 +- test/test26/hello.sh | 2 +- test/test99/hello.sh | 4 +- 35 files changed, 149 insertions(+), 50 deletions(-) create mode 100644 test/common_knight/functions/exit.c create mode 100644 test/common_knight/functions/putchar.c rename {functions => test/common_x86/functions}/exit.c (100%) rename {functions => test/common_x86/functions}/putchar.c (100%) create mode 100755 test/test01/hello-knight-posix.sh rename test/test01/{hello.sh => hello-x86.sh} (86%) diff --git a/CHANGELOG.org b/CHANGELOG.org index fb473c8..fabcbc2 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -27,6 +27,7 @@ Added support for \0 Added support for GET_MACHINE_FLAGS in tests Added --architecture flag Added first knight-posix test +Added second knight-posix test ** Changed Converted M2-Planet to use GNU style error message @@ -37,6 +38,7 @@ Updated hex2 to current version Updated get_machine to current version Updated to mescc-tools 0.6.0 syntax Changed default architecture to knight-native +Moved x86 specific exit.c and putchar.c to test/common_x86/functions ** Fixed Fixed typo in file headers diff --git a/makefile b/makefile index a2cf1d8..c86a621 100644 --- a/makefile +++ b/makefile @@ -64,7 +64,8 @@ results: # tests test: test00-x86-binary \ test00-knight-posix-binary \ - test01-binary \ + test01-x86-binary \ + test01-knight-posix-binary \ test02-binary \ test03-binary \ test04-binary \ @@ -98,8 +99,11 @@ test00-x86-binary: M2-Planet | results test00-knight-posix-binary: M2-Planet | results test/test00/hello-knight-posix.sh -test01-binary: M2-Planet | results - test/test01/hello.sh +test01-x86-binary: M2-Planet | results + test/test01/hello-x86.sh + +test01-knight-posix-binary: M2-Planet | results + test/test01/hello-knight-posix.sh test02-binary: M2-Planet | results test/test02/hello.sh diff --git a/test/common_knight/functions/exit.c b/test/common_knight/functions/exit.c new file mode 100644 index 0000000..91617ee --- /dev/null +++ b/test/common_knight/functions/exit.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2016 Jeremiah Orians + * This file is part of M2-Planet. + * + * M2-Planet is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * M2-Planet is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with M2-Planet. If not, see . + */ + +// CONSTANT EXIT_FAILURE 1 +// CONSTANT EXIT_SUCCESS 0 + +void exit(int value) +{ + /* Until we need to do a better job */ + asm("HALT"); +} diff --git a/test/common_knight/functions/putchar.c b/test/common_knight/functions/putchar.c new file mode 100644 index 0000000..2847974 --- /dev/null +++ b/test/common_knight/functions/putchar.c @@ -0,0 +1,23 @@ +/* Copyright (C) 2016 Jeremiah Orians + * This file is part of M2-Planet. + * + * M2-Planet is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * M2-Planet is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with M2-Planet. If not, see . + */ + +void putchar(int c) +{ + asm("LOAD R0 R14 0" + "FALSE R1" + "FPUTC"); +} diff --git a/functions/exit.c b/test/common_x86/functions/exit.c similarity index 100% rename from functions/exit.c rename to test/common_x86/functions/exit.c diff --git a/functions/putchar.c b/test/common_x86/functions/putchar.c similarity index 100% rename from functions/putchar.c rename to test/common_x86/functions/putchar.c diff --git a/test/test.answers b/test/test.answers index 36e1c11..9273d11 100644 --- a/test/test.answers +++ b/test/test.answers @@ -1,6 +1,7 @@ 96dcb1cde9bc98c736fb33146982215f4509ae8539475e513e9cef326c78cbda test/results/test00-knight-posix-binary c52562bd0aabb86ce8ca177f22f8d0455769b444df2d4d62894faab63b7151d8 test/results/test00-x86-binary -eae96857f2b6d8e8ba86ac06e72345ea572622b358b23978bb5f2db1baadf41c test/results/test01-binary +fab674644b9519e8ec39e254e6b13fe5eccb9f861f7d9e7d2f736d40875b7546 test/results/test01-knight-posix-binary +eae96857f2b6d8e8ba86ac06e72345ea572622b358b23978bb5f2db1baadf41c test/results/test01-x86-binary 8ead336d2f3f72d5874230492e0472edec61d355905e8636e3dfb2731695037c test/results/test02-binary 2313cb3f1a2b9eb6bf15f8d43418e15d6c16f7f1b5c22700fdfc2b38beb59192 test/results/test03-binary b7ddb37063c541c6a315809c4438aa235d6702f54bb64f4ffc88dbe78617de81 test/results/test04-binary diff --git a/test/test01/hello-knight-posix.sh b/test/test01/hello-knight-posix.sh new file mode 100755 index 0000000..2912029 --- /dev/null +++ b/test/test01/hello-knight-posix.sh @@ -0,0 +1,44 @@ +#! /bin/sh +## Copyright (C) 2017 Jeremiah Orians +## This file is part of M2-Planet. +## +## M2-Planet is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## M2-Planet is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with M2-Planet. If not, see . + +set -x +# Build the test +bin/M2-Planet --architecture knight-posix -f test/common_knight/functions/putchar.c \ + -f test/common_knight/functions/exit.c \ + -f test/test01/library_call.c \ + -o test/test01/library_call.M1 || exit 1 + +# Macro assemble with libc written in M1-Macro +M1 -f test/common_knight/knight_defs.M1 \ + -f test/common_knight/libc-core.M1 \ + -f test/test01/library_call.M1 \ + --BigEndian \ + --architecture knight-posix \ + -o test/test01/library_call.hex2 || exit 2 + +# Resolve all linkages +hex2 -f test/common_knight/ELF-knight.hex2 -f test/test01/library_call.hex2 --BigEndian --architecture knight-posix --BaseAddress 0x0 -o test/results/test01-knight-posix-binary --exec_enable || exit 3 + +# Ensure binary works if host machine supports test +if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "knight*" ] +then + # Verify that the compiled program returns the correct result + out=$(./test/results/test01-knight-posix-binary 2>&1) + [ 42 = $? ] || exit 3 + [ "$out" = "Hello mes" ] || exit 4 +fi +exit 0 diff --git a/test/test01/hello.sh b/test/test01/hello-x86.sh similarity index 86% rename from test/test01/hello.sh rename to test/test01/hello-x86.sh index 805c526..9d009a7 100755 --- a/test/test01/hello.sh +++ b/test/test01/hello-x86.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test01/library_call.c \ -o test/test01/library_call.M1 || exit 1 @@ -31,13 +31,13 @@ M1 -f test/common_x86/x86_defs.M1 \ -o test/test01/library_call.hex2 || exit 2 # Resolve all linkages -hex2 -f test/common_x86/ELF-i386.hex2 -f test/test01/library_call.hex2 --LittleEndian --architecture x86 --BaseAddress 0x8048000 -o test/results/test01-binary --exec_enable || exit 3 +hex2 -f test/common_x86/ELF-i386.hex2 -f test/test01/library_call.hex2 --LittleEndian --architecture x86 --BaseAddress 0x8048000 -o test/results/test01-x86-binary --exec_enable || exit 3 # Ensure binary works if host machine supports test if [ "$(get_machine ${GET_MACHINE_FLAGS})" = "x86" ] then # Verify that the compiled program returns the correct result - out=$(./test/results/test01-binary 2>&1) + out=$(./test/results/test01-x86-binary 2>&1) [ 42 = $? ] || exit 3 [ "$out" = "Hello mes" ] || exit 4 fi diff --git a/test/test02/hello.sh b/test/test02/hello.sh index dc6109b..2892050 100755 --- a/test/test02/hello.sh +++ b/test/test02/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test02/if.c \ -o test/test02/if.M1 || exit 1 diff --git a/test/test03/hello.sh b/test/test03/hello.sh index 0dba03a..4630947 100755 --- a/test/test03/hello.sh +++ b/test/test03/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test03/constant.c \ -o test/test03/constant.M1 || exit 1 diff --git a/test/test04/hello.sh b/test/test04/hello.sh index c4da7b5..b6919b0 100755 --- a/test/test04/hello.sh +++ b/test/test04/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test04/call.c \ -o test/test04/call.M1 || exit 1 diff --git a/test/test05/hello.sh b/test/test05/hello.sh index 5861bbd..c537c95 100755 --- a/test/test05/hello.sh +++ b/test/test05/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test05/string.c \ -o test/test05/string.M1 || exit 1 diff --git a/test/test06/hello.sh b/test/test06/hello.sh index 4f447ae..956f6c7 100755 --- a/test/test06/hello.sh +++ b/test/test06/hello.sh @@ -17,7 +17,7 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ -f test/test06/for.c \ -o test/test06/for.M1 || exit 1 diff --git a/test/test07/hello.sh b/test/test07/hello.sh index e592161..79fa5b8 100755 --- a/test/test07/hello.sh +++ b/test/test07/hello.sh @@ -17,8 +17,8 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test07/do.c \ -o test/test07/do.M1 || exit 1 diff --git a/test/test08/hello.sh b/test/test08/hello.sh index 209d4ce..edf28a8 100755 --- a/test/test08/hello.sh +++ b/test/test08/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f functions/malloc.c \ -f test/test08/struct.c \ -o test/test08/struct.M1 || exit 1 diff --git a/test/test09/hello.sh b/test/test09/hello.sh index 9b501bf..f180b02 100755 --- a/test/test09/hello.sh +++ b/test/test09/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test09/goto.c \ -o test/test09/goto.M1 || exit 1 diff --git a/test/test10/hello.sh b/test/test10/hello.sh index 6d4868a..6bd786a 100755 --- a/test/test10/hello.sh +++ b/test/test10/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f functions/malloc.c \ -f test/test10/nested_struct.c \ -o test/test10/nested_struct.M1 || exit 1 diff --git a/test/test100/hello.sh b/test/test100/hello.sh index 610ad6c..fdc3311 100755 --- a/test/test100/hello.sh +++ b/test/test100/hello.sh @@ -22,7 +22,7 @@ then ./bin/M2-Planet --architecture x86 -f functions/file.c \ -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/match.c \ -f functions/in_set.c \ -f functions/numerate_number.c \ @@ -42,7 +42,7 @@ then ./bin/M2-Planet-seed --architecture x86 -f functions/file.c \ -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/match.c \ -f functions/in_set.c \ -f functions/numerate_number.c \ @@ -78,7 +78,7 @@ ${CC} ${CFLAGS} \ ./bin/M2-Planet-gcc --architecture x86 -f functions/file.c \ -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/match.c \ -f functions/in_set.c \ -f functions/numerate_number.c \ @@ -122,7 +122,7 @@ then ./test/results/test100-binary --architecture x86 -f functions/file.c \ -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/match.c \ -f functions/in_set.c \ -f functions/numerate_number.c \ diff --git a/test/test11/hello.sh b/test/test11/hello.sh index af385da..11d6f25 100755 --- a/test/test11/hello.sh +++ b/test/test11/hello.sh @@ -17,8 +17,8 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test11/break-do.c \ -o test/test11/break-do.M1 || exit 1 diff --git a/test/test12/hello.sh b/test/test12/hello.sh index 523c90c..facb5c8 100755 --- a/test/test12/hello.sh +++ b/test/test12/hello.sh @@ -17,8 +17,8 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test12/break-for.c \ -o test/test12/break-for.M1 || exit 1 diff --git a/test/test13/hello.sh b/test/test13/hello.sh index 50e4726..019953d 100755 --- a/test/test13/hello.sh +++ b/test/test13/hello.sh @@ -17,8 +17,8 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f test/test13/break-while.c \ -o test/test13/break-while.M1 || exit 1 diff --git a/test/test14/hello.sh b/test/test14/hello.sh index ec7315e..861a1dc 100755 --- a/test/test14/hello.sh +++ b/test/test14/hello.sh @@ -17,7 +17,7 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ -f test/test14/basic_args.c \ -o test/test14/basic_args.M1 || exit 1 diff --git a/test/test15/hello.sh b/test/test15/hello.sh index d5528b0..fbb0cef 100755 --- a/test/test15/hello.sh +++ b/test/test15/hello.sh @@ -18,7 +18,7 @@ set -ex # Build the test bin/M2-Planet --architecture x86 -f functions/file.c \ - -f functions/putchar.c \ + -f test/common_x86/functions/putchar.c \ -f test/test15/file_read.c \ -o test/test15/file_read.M1 || exit 1 diff --git a/test/test16/hello.sh b/test/test16/hello.sh index 1cc7524..58e2995 100755 --- a/test/test16/hello.sh +++ b/test/test16/hello.sh @@ -18,7 +18,7 @@ set -ex # Build the test bin/M2-Planet --architecture x86 -f functions/file.c \ - -f functions/putchar.c \ + -f test/common_x86/functions/putchar.c \ -f test/test16/file_write.c \ -o test/test16/file_write.M1 || exit 1 diff --git a/test/test17/hello.sh b/test/test17/hello.sh index 54bca23..3b81585 100755 --- a/test/test17/hello.sh +++ b/test/test17/hello.sh @@ -19,7 +19,7 @@ set -ex # Build the test bin/M2-Planet --architecture x86 -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/putchar.c \ + -f test/common_x86/functions/putchar.c \ -f test/test17/memset.c \ -o test/test17/memset.M1 || exit 1 diff --git a/test/test19/hello.sh b/test/test19/hello.sh index ba57534..3968825 100755 --- a/test/test19/hello.sh +++ b/test/test19/hello.sh @@ -20,7 +20,7 @@ set -ex bin/M2-Planet --architecture x86 -f functions/file.c \ -f functions/malloc.c \ -f functions/calloc.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/match.c \ -f functions/in_set.c \ -f functions/numerate_number.c \ diff --git a/test/test20/hello.sh b/test/test20/hello.sh index 51acdf7..1513c8b 100755 --- a/test/test20/hello.sh +++ b/test/test20/hello.sh @@ -17,8 +17,8 @@ set -x # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ - -f functions/exit.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ + -f test/common_x86/functions/exit.c \ -f functions/malloc.c \ -f test/test20/struct.c \ -o test/test20/struct.M1 || exit 1 diff --git a/test/test21/hello.sh b/test/test21/hello.sh index aef2a2c..8cad0c2 100755 --- a/test/test21/hello.sh +++ b/test/test21/hello.sh @@ -17,7 +17,7 @@ set -x # Build the test -./bin/M2-Planet --architecture x86 -f functions/exit.c \ +./bin/M2-Planet --architecture x86 -f test/common_x86/functions/exit.c \ -f functions/file.c \ -f functions/file_print.c \ -f functions/malloc.c \ diff --git a/test/test22/hello.sh b/test/test22/hello.sh index a4fad6f..204cb3a 100755 --- a/test/test22/hello.sh +++ b/test/test22/hello.sh @@ -17,7 +17,7 @@ set -x # Build the test -./bin/M2-Planet --architecture x86 -f functions/exit.c \ +./bin/M2-Planet --architecture x86 -f test/common_x86/functions/exit.c \ -f functions/file.c \ -f functions/file_print.c \ -f functions/malloc.c \ diff --git a/test/test23/hello.sh b/test/test23/hello.sh index a5cc05c..dee99df 100755 --- a/test/test23/hello.sh +++ b/test/test23/hello.sh @@ -17,7 +17,7 @@ set -x # Build the test -./bin/M2-Planet --architecture x86 -f functions/exit.c \ +./bin/M2-Planet --architecture x86 -f test/common_x86/functions/exit.c \ -f functions/file.c \ -f functions/file_print.c \ -f functions/malloc.c \ diff --git a/test/test24/hello.sh b/test/test24/hello.sh index 7b6d814..49b7b0b 100755 --- a/test/test24/hello.sh +++ b/test/test24/hello.sh @@ -17,7 +17,7 @@ set -x # Build the test -./bin/M2-Planet --architecture x86 -f functions/exit.c \ +./bin/M2-Planet --architecture x86 -f test/common_x86/functions/exit.c \ -f functions/file.c \ -f functions/file_print.c \ -f functions/malloc.c \ diff --git a/test/test25/hello.sh b/test/test25/hello.sh index 6de4da9..b8150e2 100755 --- a/test/test25/hello.sh +++ b/test/test25/hello.sh @@ -17,7 +17,7 @@ set -x # Build the test -./bin/M2-Planet --architecture x86 -f functions/exit.c \ +./bin/M2-Planet --architecture x86 -f test/common_x86/functions/exit.c \ -f functions/file.c \ -f functions/file_print.c \ -f functions/malloc.c \ diff --git a/test/test26/hello.sh b/test/test26/hello.sh index 0ffe74e..398ac66 100755 --- a/test/test26/hello.sh +++ b/test/test26/hello.sh @@ -25,7 +25,7 @@ set -x -f functions/match.c \ -f functions/file.c \ -f functions/file_print.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f test/test26/lisp.c \ -f test/test26/lisp_cell.c \ -f test/test26/lisp_eval.c \ diff --git a/test/test99/hello.sh b/test/test99/hello.sh index 913875e..5045cf7 100755 --- a/test/test99/hello.sh +++ b/test/test99/hello.sh @@ -17,9 +17,9 @@ set -ex # Build the test -bin/M2-Planet --architecture x86 -f functions/putchar.c \ +bin/M2-Planet --architecture x86 -f test/common_x86/functions/putchar.c \ -f functions/getchar.c \ - -f functions/exit.c \ + -f test/common_x86/functions/exit.c \ -f functions/malloc.c \ -f test/test99/cc500.c \ -o test/test99/cc0.M1 || exit 1