Mercurial > pub > dyncall > dyncall
changeset 547:917d5d213815
- integrate test/callback_plain_c++ into main build
author | Tassilo Philipp |
---|---|
date | Tue, 31 May 2022 19:59:10 +0200 |
parents | ba70fb631bea |
children | a6d00ee46731 |
files | test/CMakeLists.txt test/Makefile.embedded test/Makefile.generic test/Nmakefile test/makepkg.sh test/mkfile test/plain_c++/Makefile.generic |
diffstat | 7 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/test/CMakeLists.txt Tue May 31 19:29:34 2022 +0200 +++ b/test/CMakeLists.txt Tue May 31 19:59:10 2022 +0200 @@ -6,6 +6,7 @@ if (CMAKE_CXX_COMPILER_WORKS) add_subdirectory(plain_c++) +add_subdirectory(callback_plain_c++) add_subdirectory(suite2) add_subdirectory(suite3) add_subdirectory(suite_floats)
--- a/test/Makefile.embedded Tue May 31 19:29:34 2022 +0200 +++ b/test/Makefile.embedded Tue May 31 19:59:10 2022 +0200 @@ -19,6 +19,7 @@ cd thunk && ${MAKE_CMD} cd malloc_wx && ${MAKE_CMD} cd callback_plain && ${MAKE_CMD} + cd callback_plain_c++ && ${MAKE_CMD} cd callback_suite && ${MAKE_CMD} cd callback_suite_aggrs && ${MAKE_CMD} all-c: @@ -58,6 +59,7 @@ cd suite3 && ${MAKE_CMD} clean cd suite_floats && ${MAKE_CMD} clean cd callback_plain && ${MAKE_CMD} clean + cd callback_plain_c++ && ${MAKE_CMD} clean cd callback_suite && ${MAKE_CMD} clean cd callback_suite_aggrs && ${MAKE_CMD} clean cd ellipsis && ${MAKE_CMD} clean
--- a/test/Makefile.generic Tue May 31 19:29:34 2022 +0200 +++ b/test/Makefile.generic Tue May 31 19:59:10 2022 +0200 @@ -1,5 +1,5 @@ -ALL=call_suite call_suite_aggrs callback_suite callback_suite_aggrs plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf syscall dynload_plain resolve_self thunk malloc_wx callback_plain -PACK=call_suite call_suite_aggrs callback_suite callback_suite_aggrs plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf dynload_plain resolve_self callback_plain +ALL=call_suite call_suite_aggrs callback_suite callback_suite_aggrs plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf syscall dynload_plain resolve_self thunk malloc_wx callback_plain callback_plain_c++ +PACK=call_suite call_suite_aggrs callback_suite callback_suite_aggrs plain plain_c++ suite suite2 suite3 suite_floats ellipsis callf dynload_plain resolve_self callback_plain callback_plain_c++ .PHONY: all clean run-tests install distclean ${ALL} all clean install: ${MAKE} TARGET=$@ ${ALL} @@ -65,12 +65,14 @@ cd thunk && ${MAKE} cd malloc_wx && ${MAKE} cd callback_plain && ${MAKE} + cd callback_plain_c++ && ${MAKE} cd callback_suite && ${MAKE} cd callback_suite_aggrs && ${MAKE} run-dyncallback: thunk/thunk malloc_wx/malloc_wx callback_plain/callback_plain + callback_plain_c++/callback_plain_c++ callback_suite/callback_suite callback_suite_aggrs/callback_suite_aggrs
--- a/test/Nmakefile Tue May 31 19:29:34 2022 +0200 +++ b/test/Nmakefile Tue May 31 19:59:10 2022 +0200 @@ -30,7 +30,7 @@ !INCLUDE $(TOP)\buildsys\nmake\prolog.nmake -DIRS = call_suite call_suite_aggrs suite suite2 suite3 suite_floats callf ellipsis plain plain_c++ nm dynload_plain resolve_self thunk malloc_wx callback_plain callback_suite callback_suite_aggrs +DIRS = call_suite call_suite_aggrs suite suite2 suite3 suite_floats callf ellipsis plain plain_c++ nm dynload_plain resolve_self thunk malloc_wx callback_plain callback_plain_c++ callback_suite callback_suite_aggrs !IF "$(BUILD_ARCH)" == "x86" DIRS = $(DIRS) suite_x86win32fast suite_x86win32std suite2_x86win32fast suite2_x86win32std !ENDIF
--- a/test/makepkg.sh Tue May 31 19:29:34 2022 +0200 +++ b/test/makepkg.sh Tue May 31 19:59:10 2022 +0200 @@ -4,7 +4,7 @@ TOP=.. . $TOP/ConfigVars -TESTS="callf ellipsis malloc_wx plain plain_c++ suite suite2 suite3 suite_floats callback_plain callback_suite" +TESTS="callf ellipsis malloc_wx plain plain_c++ suite suite2 suite3 suite_floats callback_plain callback_plain_c++ callback_suite" # addition test: # # callback_plain callback_suite callf
--- a/test/mkfile Tue May 31 19:29:34 2022 +0200 +++ b/test/mkfile Tue May 31 19:59:10 2022 +0200 @@ -22,7 +22,7 @@ <$TOP/buildsys/mk/prolog.mk # only C-stuff for now, b/c C++ on Plan9 is rather inexistant -DIRS = callf plain call_suite call_suite_aggrs suite thunk malloc_wx callback_plain callback_suite callback_suite_aggrs +DIRS = callf plain call_suite call_suite_aggrs suite thunk malloc_wx callback_plain callback_plain_c++ callback_suite callback_suite_aggrs #DIRS = plain_c++ suite2 suite3 suite_floats ellipsis <$TOP/buildsys/mk/epilog.mk
--- a/test/plain_c++/Makefile.generic Tue May 31 19:29:34 2022 +0200 +++ b/test/plain_c++/Makefile.generic Tue May 31 19:59:10 2022 +0200 @@ -3,7 +3,7 @@ SRCTOP = ${VPATH}/../.. BLDTOP = ../.. CXXFLAGS += -I${SRCTOP}/dyncall -LDLIBS += -L${BLDTOP}/dyncall -ldyncall_s +LDLIBS += -L${BLDTOP}/dyncall -ldyncall_s -L${BLDTOP}/dyncallback -ldyncallback_s .PHONY: all clean install all: ${APP} ${APP}: ${OBJS}