diff options
| -rw-r--r-- | include/fuse_common.h | 10 | ||||
| -rw-r--r-- | meson.build | 6 | ||||
| -rw-r--r-- | test/meson.build | 3 | ||||
| -rw-r--r-- | test/test_abi.c | 18 | ||||
| -rw-r--r-- | test/test_ctests.py | 4 |
5 files changed, 25 insertions, 16 deletions
diff --git a/include/fuse_common.h b/include/fuse_common.h index b82f2c4..041188e 100644 --- a/include/fuse_common.h +++ b/include/fuse_common.h @@ -30,12 +30,6 @@ #define FUSE_MAKE_VERSION(maj, min) ((maj) * 100 + (min)) #define FUSE_VERSION FUSE_MAKE_VERSION(FUSE_MAJOR_VERSION, FUSE_MINOR_VERSION) -#ifdef HAVE_STATIC_ASSERT -#define fuse_static_assert(condition, message) static_assert(condition, message) -#else -#define fuse_static_assert(condition, message) -#endif - #ifdef __cplusplus extern "C" { #endif @@ -129,8 +123,6 @@ struct fuse_file_info { uint64_t reserved[2]; }; -fuse_static_assert(sizeof(struct fuse_file_info) == 64, - "fuse_file_info size mismatch"); /** * Configuration parameters passed to fuse_session_loop_mt() and @@ -719,8 +711,6 @@ struct fuse_conn_info { */ uint16_t reserved[31]; }; -fuse_static_assert(sizeof(struct fuse_conn_info) == 128, - "Size of struct fuse_conn_info must be 128 bytes"); struct fuse_session; struct fuse_pollhandle; diff --git a/meson.build b/meson.build index f98ef8a..07c7295 100644 --- a/meson.build +++ b/meson.build @@ -59,7 +59,6 @@ include_default = ''' #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <assert.h> /* For static_assert */ #include <pthread.h> /* For pthread_setname_np */ ''' args_default = [ '-D_GNU_SOURCE' ] @@ -82,11 +81,6 @@ endforeach # Special case checks that need custom code special_funcs = { - 'static_assert': ''' - #include <assert.h> - static_assert(1, "test"); - int main(void) { return 0; } - ''', 'pthread_setname_np': ''' #include <pthread.h> int main(void) { diff --git a/test/meson.build b/test/meson.build index 3329216..9f6f409 100644 --- a/test/meson.build +++ b/test/meson.build @@ -22,6 +22,9 @@ td += executable('test_want_conversion', 'test_want_conversion.c', td += executable('test_signals', 'test_signals.c', dependencies: [ libfuse_dep, thread_dep ], install: false) +td += executable('test_abi', 'test_abi.c', + dependencies: [ libfuse_dep ], + install: false) test_scripts = [ 'conftest.py', 'pytest.ini', 'test_examples.py', 'util.py', 'test_ctests.py', 'test_custom_io.py' ] diff --git a/test/test_abi.c b/test/test_abi.c new file mode 100644 index 0000000..99daa09 --- /dev/null +++ b/test/test_abi.c @@ -0,0 +1,18 @@ +#define FUSE_USE_VERSION 30 + +#include "fuse.h" + +#include <stdio.h> +#include <stdlib.h> + +int main(void) +{ + if (sizeof(struct fuse_file_info) != 64) { + fprintf(stderr, "struct fuse_file_info size mismatch\n"); + exit(1); + } + if (sizeof(struct fuse_conn_info) != 128) { + fprintf(stderr, "struct fuse_conn_info size mismatch\n"); + exit(1); + } +} diff --git a/test/test_ctests.py b/test/test_ctests.py index ae5cc8f..b3863e0 100644 --- a/test/test_ctests.py +++ b/test/test_ctests.py @@ -20,6 +20,10 @@ import os.path pytestmark = fuse_test_marker() +def test_abi(): + cmdline = [ pjoin(basename, 'test', 'test_abi') ] + subprocess.check_call(cmdline) + @pytest.mark.skipif('FUSE_CAP_WRITEBACK_CACHE' not in fuse_caps, reason='not supported by running kernel') @pytest.mark.parametrize("writeback", (False, True)) |