Mercurial > pub > dyncall > dyncall

changeset 526:93628a1eaed4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: integrate new tests into makefiles, some cleanups
author Tassilo Philipp
date Thu, 14 Apr 2022 10:06:58 +0200
parents cc607f753178
children ed8835abe05f
files test/CMakeLists.txt test/Makefile.embedded test/Makefile.generic test/Nmakefile test/call_suite_aggrs/mk-cases.lua test/mkfile
diffstat 6 files changed, 26 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/test/CMakeLists.txt	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/CMakeLists.txt	Thu Apr 14 10:06:58 2022 +0200
@@ -13,10 +13,11 @@
 endif ()
 
 add_subdirectory(call_suite)
+add_subdirectory(call_suite_aggrs)
 add_subdirectory(callback_suite)
+add_subdirectory(callback_suite_aggrs)
 add_subdirectory(plain)
 add_subdirectory(suite)
-add_subdirectory(call_suite_aggrs)
 add_subdirectory(callf)
 add_subdirectory(nm)
 add_subdirectory(dynload_plain)
--- a/test/Makefile.embedded	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/Makefile.embedded	Thu Apr 14 10:06:58 2022 +0200
@@ -5,12 +5,12 @@
 	cd dynload_plain && ${MAKE_CMD}
 	cd resolve_self && ${MAKE_CMD}
 all-dyncall:
+	cd call_suite && ${MAKE_CMD}
+	cd call_suite_aggrs && ${MAKE_CMD}
 	cd suite && ${MAKE_CMD}
-	cd call_suite && ${MAKE_CMD}
 	cd suite2 && ${MAKE_CMD}
 	cd suite3 && ${MAKE_CMD}
 	cd suite_floats && ${MAKE_CMD}
-	cd call_suite_aggrs && ${MAKE_CMD}
 	cd callf && ${MAKE_CMD}
 	cd plain && ${MAKE_CMD}
 	cd plain_c++ && ${MAKE_CMD}
@@ -20,12 +20,13 @@
 	cd malloc_wx && ${MAKE_CMD}
 	cd callback_plain && ${MAKE_CMD}
 	cd callback_suite && ${MAKE_CMD}
+	cd callback_suite_aggrs && ${MAKE_CMD}
 all-c:
 	cd plain && ${MAKE_CMD}
 	cd syscall && ${MAKE_CMD}
-	cd suite && ${MAKE_CMD}
 	cd call_suite && ${MAKE_CMD}
 	cd call_suite_aggrs && ${MAKE_CMD}
+	cd suite && ${MAKE_CMD}
 	cd callf && ${MAKE_CMD}
 	cd dynload_plain && ${MAKE_CMD}
 	cd resolve_self && ${MAKE_CMD}
@@ -33,6 +34,7 @@
 	cd malloc_wx && ${MAKE_CMD}
 	cd callback_plain && ${MAKE_CMD}
 	cd callback_suite && ${MAKE_CMD}
+	cd callback_suite_aggrs && ${MAKE_CMD}
 all-win32:
 	cd suite_x86win32std  && ${MAKE_CMD}
 	cd suite_x86win32fast && ${MAKE_CMD}
@@ -49,14 +51,15 @@
 	cd plain && ${MAKE_CMD} clean
 	cd plain_c++ && ${MAKE_CMD} clean
 	cd syscall && ${MAKE_CMD} clean
+	cd call_suite && ${MAKE_CMD} clean
+	cd call_suite_aggrs && ${MAKE_CMD} clean
 	cd suite && ${MAKE_CMD} clean
-	cd call_suite && ${MAKE_CMD} clean
 	cd suite2 && ${MAKE_CMD} clean
 	cd suite3 && ${MAKE_CMD} clean
 	cd suite_floats && ${MAKE_CMD} clean
-	cd call_suite_aggrs && ${MAKE_CMD} clean
 	cd callback_plain && ${MAKE_CMD} clean
 	cd callback_suite && ${MAKE_CMD} clean
+	cd callback_suite_aggrs && ${MAKE_CMD} clean
 	cd ellipsis && ${MAKE_CMD} clean
 	cd callf && ${MAKE_CMD} clean
 	cd dynload_plain && ${MAKE_CMD} clean
--- a/test/Makefile.generic	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/Makefile.generic	Thu Apr 14 10:06:58 2022 +0200
@@ -1,5 +1,5 @@
-ALL=call_suite callback_suite plain plain_c++ suite suite2 suite3 suite_floats call_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 call_suite_aggrs 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
+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
 .PHONY: all clean run-tests install distclean ${ALL} 
 all clean install: 
 	${MAKE} TARGET=$@ ${ALL}
@@ -10,8 +10,8 @@
 all-c:
 	cd plain && ${MAKE}
 	cd call_suite && ${MAKE}
+	cd call_suite_aggrs && ${MAKE}
 	cd suite && ${MAKE}
-	cd call_suite_aggrs && ${MAKE}
 	cd callf && ${MAKE}
 	cd syscall && ${MAKE}
 	cd dynload_plain && ${MAKE}
@@ -20,6 +20,7 @@
 	cd malloc_wx && ${MAKE}
 	cd callback_plain && ${MAKE}
 	cd callback_suite && ${MAKE}
+	cd callback_suite_aggrs && ${MAKE}
 all-win32:
 	cd suite_x86win32std  && ${MAKE}
 	cd suite_x86win32fast && ${MAKE}
@@ -34,11 +35,11 @@
 	cd plain && ${MAKE}
 	cd plain_c++ && ${MAKE}
 	cd call_suite && ${MAKE}
+	cd call_suite_aggrs && ${MAKE}
 	cd suite && ${MAKE}
 	cd suite2 && ${MAKE}
 	cd suite3 && ${MAKE}
 	cd suite_floats && ${MAKE}
-	cd call_suite_aggrs && ${MAKE}
 	cd ellipsis && ${MAKE}
 	cd callf && ${MAKE}
 	cd syscall && ${MAKE}
@@ -46,11 +47,11 @@
 	plain/plain
 	plain_c++/plain_c++
 	call_suite/call_suite
+	call_suite_aggrs/call_suite_aggrs
 	suite/suite
 	suite2/suite2
 	suite3/suite3
 	suite_floats/suite_floats
-	call_suite_aggrs/call_suite_aggrs
 	ellipsis/ellipsis
 	callf/callf
 	syscall/syscall
@@ -65,11 +66,13 @@
 	cd malloc_wx && ${MAKE}
 	cd callback_plain && ${MAKE}
 	cd callback_suite && ${MAKE}
+	cd callback_suite_aggrs && ${MAKE}
 run-dyncallback:
 	thunk/thunk
 	malloc_wx/malloc_wx
 	callback_plain/callback_plain
 	callback_suite/callback_suite
+	callback_suite_aggrs/callback_suite_aggrs
 
 pack: ${PACK}
 	${VPATH}/pack-tests.sh ${PACK}
--- a/test/Nmakefile	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/Nmakefile	Thu Apr 14 10:06:58 2022 +0200
@@ -30,7 +30,7 @@
 !INCLUDE $(TOP)\buildsys\nmake\prolog.nmake
 
 
-DIRS = call_suite suite suite2 suite3 suite_floats call_suite_aggrs callf ellipsis plain plain_c++ nm dynload_plain resolve_self thunk malloc_wx callback_plain callback_suite
+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
 !IF "$(BUILD_ARCH)" == "x86"
 DIRS = $(DIRS) suite_x86win32fast suite_x86win32std suite2_x86win32fast suite2_x86win32std
 !ENDIF
--- a/test/call_suite_aggrs/mk-cases.lua	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/call_suite_aggrs/mk-cases.lua	Thu Apr 14 10:06:58 2022 +0200
@@ -14,7 +14,7 @@
   local sig = trim(sig)
   local fsig = put_sig_rtype_first(sig)
   local h = { "/* ",id,":",sig," */ " }
-  local t = { "" }
+  local t = { }
   local pos = -1
   local n_nest = 0
   local aggr = { }
@@ -25,7 +25,6 @@
     local name = "a"..pos
     local ch   = fsig:sub(i,i)
 
-
     -- aggregate nest level change?
     if ch == '{' or ch == '<' then
       n_nest = n_nest + 1
@@ -64,11 +63,11 @@
       if n_nest == 0 then
         h[#h+1] = ch
         -- aggregate types have more than one char
-        if #h[#h] > 1 then
+        if #ch > 1 then
           if aggrcpsimple then
-            t[#t+1] = '*('..h[#h]..'*)V_a['..pos.."]="..name..";"
+            t[#t+1] = '*('..ch..'*)V_a['..pos.."]="..name..";"
           else
-            t[#t+1] = 'f_cp'..h[#h]:match('A.*')..'(V_a['..pos.."],&"..name..");"
+            t[#t+1] = 'f_cp'..ch:match('A.*')..'(V_a['..pos.."],&"..name..");"
           end
           if aggrmutabletest then
             t[#t] = t[#t]..'memset(&'..name..',0,sizeof('..name..'));'
--- a/test/mkfile	Wed Apr 13 15:55:50 2022 +0200
+++ b/test/mkfile	Thu Apr 14 10:06:58 2022 +0200
@@ -21,8 +21,8 @@
 TOP		= ..
 <$TOP/buildsys/mk/prolog.mk
 
-# only C-stuff for now...
-DIRS = callf plain call_suite suite call_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
+# 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 = plain_c++ suite2 suite3 suite_floats ellipsis
 
 <$TOP/buildsys/mk/epilog.mk