# HG changeset patch # User Tassilo Philipp # Date 1643210047 -3600 # Node ID c1eba6f08064249fbb370f9dab331514679dd60b # Parent 94c7904977aa6f478c3f0566549a5f3e1242a9e4 - added test/suite_aggr to makefiles diff -r 94c7904977aa -r c1eba6f08064 test/Makefile.embedded --- a/test/Makefile.embedded Wed Jan 26 16:00:39 2022 +0100 +++ b/test/Makefile.embedded Wed Jan 26 16:14:07 2022 +0100 @@ -10,6 +10,7 @@ cd suite2 && ${MAKE_CMD} cd suite3 && ${MAKE_CMD} cd suite_floats && ${MAKE_CMD} + cd suite_aggrs && ${MAKE_CMD} cd callf && ${MAKE_CMD} cd plain && ${MAKE_CMD} cd plain_c++ && ${MAKE_CMD} @@ -24,6 +25,7 @@ cd syscall && ${MAKE_CMD} cd suite && ${MAKE_CMD} cd call_suite && ${MAKE_CMD} + cd suite_aggrs && ${MAKE_CMD} cd callf && ${MAKE_CMD} cd dynload_plain && ${MAKE_CMD} cd resolve_self && ${MAKE_CMD} @@ -52,6 +54,7 @@ cd suite2 && ${MAKE_CMD} clean cd suite3 && ${MAKE_CMD} clean cd suite_floats && ${MAKE_CMD} clean + cd suite_aggrs && ${MAKE_CMD} clean cd callback_plain && ${MAKE_CMD} clean cd callback_suite && ${MAKE_CMD} clean cd ellipsis && ${MAKE_CMD} clean diff -r 94c7904977aa -r c1eba6f08064 test/Makefile.generic --- a/test/Makefile.generic Wed Jan 26 16:00:39 2022 +0100 +++ b/test/Makefile.generic Wed Jan 26 16:14:07 2022 +0100 @@ -1,5 +1,5 @@ -ALL=call_suite callback_suite plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf syscall dynload_plain resolve_self thunk malloc_wx callback_plain -PACK=call_suite callback_suite plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf dynload_plain resolve_self callback_plain +ALL=call_suite callback_suite plain plain_c++ suite suite2 suite3 suite_floats suite_aggrs ellipsis callf syscall dynload_plain resolve_self thunk malloc_wx callback_plain +PACK=call_suite callback_suite plain plain_c++ suite suite2 suite3 suite_floats suite_aggrs ellipsis callf dynload_plain resolve_self callback_plain .PHONY: all clean run-tests install distclean ${ALL} all clean install: ${MAKE} TARGET=$@ ${ALL} @@ -11,6 +11,7 @@ cd plain && ${MAKE} cd call_suite && ${MAKE} cd suite && ${MAKE} + cd suite_aggrs && ${MAKE_CMD} cd callf && ${MAKE} cd syscall && ${MAKE} cd dynload_plain && ${MAKE} @@ -37,6 +38,7 @@ cd suite2 && ${MAKE} cd suite3 && ${MAKE} cd suite_floats && ${MAKE} + cd suite_aggrs && ${MAKE_CMD} cd ellipsis && ${MAKE} cd callf && ${MAKE} cd syscall && ${MAKE} @@ -48,6 +50,7 @@ suite2/suite2 suite3/suite3 suite_floats/suite_floats + suite_aggrs/suite_aggrs ellipsis/ellipsis callf/callf syscall/syscall diff -r 94c7904977aa -r c1eba6f08064 test/Nmakefile --- a/test/Nmakefile Wed Jan 26 16:00:39 2022 +0100 +++ b/test/Nmakefile Wed Jan 26 16:14:07 2022 +0100 @@ -1,6 +1,6 @@ #////////////////////////////////////////////////////////////////////////////// # -# Copyright (c) 2007-2010 Daniel Adler , +# Copyright (c) 2007-2022 Daniel Adler , # Tassilo Philipp # # Permission to use, copy, modify, and distribute this software for any @@ -30,7 +30,7 @@ !INCLUDE $(TOP)\buildsys\nmake\prolog.nmake -DIRS = call_suite suite suite2 suite3 suite_floats callf ellipsis plain plain_c++ nm dynload_plain resolve_self thunk malloc_wx callback_plain callback_suite +DIRS = call_suite suite suite2 suite3 suite_floats suite_aggrs callf ellipsis plain plain_c++ nm dynload_plain resolve_self thunk malloc_wx callback_plain callback_suite !IF "$(BUILD_ARCH)" == "x86" DIRS = $(DIRS) suite_x86win32fast suite_x86win32std suite2_x86win32fast suite2_x86win32std !ENDIF diff -r 94c7904977aa -r c1eba6f08064 test/callback_plain/Makefile.generic --- a/test/callback_plain/Makefile.generic Wed Jan 26 16:00:39 2022 +0100 +++ b/test/callback_plain/Makefile.generic Wed Jan 26 16:14:07 2022 +0100 @@ -3,7 +3,7 @@ SRCTOP = ${VPATH}/../.. BLDTOP = ../.. CFLAGS += -I${SRCTOP}/dyncall -LDLIBS += -L${BLDTOP}/dyncallback -ldyncallback_s +LDLIBS += -L${BLDTOP}/dyncall -ldyncall_s -L${BLDTOP}/dyncallback -ldyncallback_s .PHONY: all clean install all: ${APP} ${APP}: ${OBJS} diff -r 94c7904977aa -r c1eba6f08064 test/mkfile --- a/test/mkfile Wed Jan 26 16:00:39 2022 +0100 +++ b/test/mkfile Wed Jan 26 16:14:07 2022 +0100 @@ -1,7 +1,7 @@ #////////////////////////////////////////////////////////////////////////////// # -# Copyright (c) 2010 Daniel Adler , -# Tassilo Philipp +# Copyright (c) 2010-2022 Daniel Adler , +# Tassilo Philipp # # Permission to use, copy, modify, and distribute this software for any # purpose with or without fee is hereby granted, provided that the above @@ -22,7 +22,7 @@ <$TOP/buildsys/mk/prolog.mk # only C-stuff for now... -DIRS = callf plain call_suite suite thunk malloc_wx callback_plain callback_suite # plain_c++ is not included, b/c C++ on Plan9 is rather inexistant +DIRS = callf plain call_suite suite suite_aggrs thunk malloc_wx callback_plain callback_suite # plain_c++ is not included, b/c C++ on Plan9 is rather inexistant #DIRS = suite2 suite3 suite_floats ellipsis <$TOP/buildsys/mk/epilog.mk