diff options
Diffstat (limited to 'lib9p/tests')
-rw-r--r-- | lib9p/tests/client_config/config.h | 21 | ||||
-rw-r--r-- | lib9p/tests/test_compile.c | 2 | ||||
-rwxr-xr-x | lib9p/tests/test_compile.c.gen | 2 | ||||
-rw-r--r-- | lib9p/tests/test_compile_config/config.h | 19 | ||||
-rw-r--r-- | lib9p/tests/test_server/CMakeLists.txt | 1 | ||||
-rw-r--r-- | lib9p/tests/testclient-sess.c | 2 |
6 files changed, 3 insertions, 44 deletions
diff --git a/lib9p/tests/client_config/config.h b/lib9p/tests/client_config/config.h index 65ee9de..bcf030d 100644 --- a/lib9p/tests/client_config/config.h +++ b/lib9p/tests/client_config/config.h @@ -7,8 +7,6 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -/* 9P *************************************************************************/ - #define CONFIG_9P_MAX_ERR_SIZE 128 #define CONFIG_9P_MAX_9P2000_e_WELEM 16 @@ -18,23 +16,4 @@ #define CONFIG_9P_ENABLE_9P2000_L 1 /* bool */ #define CONFIG_9P_ENABLE_9P2000_p9p 1 /* bool */ -/* 9P server (unused) *********************************************************/ - -#define CONFIG_9P_SRV_MAX_MSG_SIZE ((4*1024)+24) -#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE CONFIG_9P_SRV_MAX_MSG_SIZE+16 -#define CONFIG_9P_SRV_MAX_FIDS 16 -#define CONFIG_9P_SRV_MAX_REQS 2 -#define CONFIG_9P_SRV_MAX_DEPTH 3 - -/* COROUTINE (unused) *********************************************************/ - -#define CONFIG_COROUTINE_STACK_SIZE_DEFAULT (32*1024) -#define CONFIG_COROUTINE_NAME_LEN 16 -#define CONFIG_COROUTINE_MEASURE_STACK 1 /* bool */ -#define CONFIG_COROUTINE_PROTECT_STACK 1 /* bool */ -#define CONFIG_COROUTINE_DEBUG 0 /* bool */ -#define CONFIG_COROUTINE_VALGRIND 1 /* bool */ -#define CONFIG_COROUTINE_GDB 1 /* bool */ -#define CONFIG_COROUTINE_NUM 2 - #endif /* _CONFIG_H_ */ diff --git a/lib9p/tests/test_compile.c b/lib9p/tests/test_compile.c index 8f2445d..9245eb2 100644 --- a/lib9p/tests/test_compile.c +++ b/lib9p/tests/test_compile.c @@ -1,6 +1,6 @@ /* lib9p/tests/test_compile.c - Generated by lib9p/tests/test_compile.c.gen. DO NOT EDIT! */ -#include <lib9p/9p.h> +#include <lib9p/core.h> int main(void) { [[gnu::unused]] uint64_t x; x = LIB9P_TAG_NOTAG; diff --git a/lib9p/tests/test_compile.c.gen b/lib9p/tests/test_compile.c.gen index 47046b3..1289943 100755 --- a/lib9p/tests/test_compile.c.gen +++ b/lib9p/tests/test_compile.c.gen @@ -10,7 +10,7 @@ outfile=$2 { echo "/* ${outfile} - Generated by $0. DO NOT EDIT! */" echo - echo "#include <lib9p/9p.h>" + echo "#include <lib9p/core.h>" echo 'int main(void) {' echo ' [[gnu::unused]] uint64_t x;' sed -nE 's/^\s*#\s*define\s*(\S[^ (]*)\s.*/ x = \1;/p' <"$generated_h" diff --git a/lib9p/tests/test_compile_config/config.h b/lib9p/tests/test_compile_config/config.h index cc8eec1..f899dfa 100644 --- a/lib9p/tests/test_compile_config/config.h +++ b/lib9p/tests/test_compile_config/config.h @@ -7,32 +7,13 @@ #ifndef _CONFIG_H_ #define _CONFIG_H_ -/* 9P *************************************************************************/ - #define CONFIG_9P_MAX_ERR_SIZE 128 #define CONFIG_9P_MAX_9P2000_e_WELEM 16 -#define CONFIG_9P_SRV_MAX_MSG_SIZE ((4*1024)+24) -#define CONFIG_9P_SRV_MAX_HOSTMSG_SIZE CONFIG_9P_SRV_MAX_MSG_SIZE+16 -#define CONFIG_9P_SRV_MAX_FIDS 16 -#define CONFIG_9P_SRV_MAX_REQS 2 -#define CONFIG_9P_SRV_MAX_DEPTH 3 - #define CONFIG_9P_ENABLE_9P2000 1 /* bool */ #define CONFIG_9P_ENABLE_9P2000_u 1 /* bool */ #define CONFIG_9P_ENABLE_9P2000_e 1 /* bool */ #define CONFIG_9P_ENABLE_9P2000_L 1 /* bool */ #define CONFIG_9P_ENABLE_9P2000_p9p 1 /* bool */ -/* COROUTINE ******************************************************************/ - -#define CONFIG_COROUTINE_STACK_SIZE_DEFAULT (32*1024) -#define CONFIG_COROUTINE_NAME_LEN 16 -#define CONFIG_COROUTINE_MEASURE_STACK 1 /* bool */ -#define CONFIG_COROUTINE_PROTECT_STACK 1 /* bool */ -#define CONFIG_COROUTINE_DEBUG 0 /* bool */ -#define CONFIG_COROUTINE_VALGRIND 1 /* bool */ -#define CONFIG_COROUTINE_GDB 1 /* bool */ -#define CONFIG_COROUTINE_NUM 2 - #endif /* _CONFIG_H_ */ diff --git a/lib9p/tests/test_server/CMakeLists.txt b/lib9p/tests/test_server/CMakeLists.txt index 681e583..b659373 100644 --- a/lib9p/tests/test_server/CMakeLists.txt +++ b/lib9p/tests/test_server/CMakeLists.txt @@ -19,7 +19,6 @@ target_link_libraries(test_server_objs libcr libcr_ipc libmisc - lib9p lib9p_util libhw_cr ) diff --git a/lib9p/tests/testclient-sess.c b/lib9p/tests/testclient-sess.c index 437c489..764168d 100644 --- a/lib9p/tests/testclient-sess.c +++ b/lib9p/tests/testclient-sess.c @@ -15,7 +15,7 @@ #include <libmisc/assert.h> #include <libmisc/endian.h> -#include <lib9p/9p.h> +#include <lib9p/core.h> #define MAX_MSG_SIZE (8*1024) |