diff options
| author | Ludovic Rousseau <ludovic.rousseau@free.fr> | 2023-05-09 22:25:27 +0200 |
|---|---|---|
| committer | Ludovic Rousseau <ludovic.rousseau@free.fr> | 2023-05-09 22:48:01 +0200 |
| commit | a8a70f62c07261e721816445d9c408c770cf45a2 (patch) | |
| tree | 1aa5a73f33583f9f51d3b0e605e5abc5a360eb89 | |
| parent | 3bace666b72ca120587e12acc4b3547bb8e3fa32 (diff) | |
| download | libusb-a8a70f62c07261e721816445d9c408c770cf45a2.tar.gz | |
Fix build errors of tests with --enable-debug-log
The errors were:
../../tests/set_option.c:146:31: error: no member named 'debug' in 'struct libusb_context'
LIBUSB_EXPECT(==, test_ctx->debug, 4);
~~~~~~~~ ^
../../tests/set_option.c:74:40: note: expanded from macro 'LIBUSB_EXPECT'
int64_t _lhs = (int64_t)(intptr_t)(lhs), _rhs = (int64_t)(intptr_t)(rhs); \
^~~
../../tests/set_option.c:152:31: error: no member named 'debug' in 'struct libusb_context'
LIBUSB_EXPECT(==, test_ctx->debug, 4);
~~~~~~~~ ^
../../tests/set_option.c:74:40: note: expanded from macro 'LIBUSB_EXPECT'
int64_t _lhs = (int64_t)(intptr_t)(lhs), _rhs = (int64_t)(intptr_t)(rhs); \
^~~
2 errors generated.
../../tests/init_context.c:112:31: error: no member named 'debug' in 'struct libusb_context'
LIBUSB_EXPECT(==, test_ctx->debug, LIBUSB_LOG_LEVEL_ERROR);
~~~~~~~~ ^
../../tests/init_context.c:74:40: note: expanded from macro 'LIBUSB_EXPECT'
int64_t _lhs = (int64_t)(intptr_t)(lhs), _rhs = (int64_t)(intptr_t)(rhs); \
^~~
../../tests/init_context.c:140:31: error: no member named 'log_handler' in 'struct libusb_context'
LIBUSB_EXPECT(==, test_ctx->log_handler, test_log_cb);
~~~~~~~~ ^
../../tests/init_context.c:74:40: note: expanded from macro 'LIBUSB_EXPECT'
int64_t _lhs = (int64_t)(intptr_t)(lhs), _rhs = (int64_t)(intptr_t)(rhs); \
^~~
2 errors generated.
Signed-off-by: Ludovic Rousseau <ludovic.rousseau@free.fr>
| -rw-r--r-- | libusb/version_nano.h | 2 | ||||
| -rw-r--r-- | tests/init_context.c | 4 | ||||
| -rw-r--r-- | tests/set_option.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/libusb/version_nano.h b/libusb/version_nano.h index 6fd8422..fec9410 100644 --- a/libusb/version_nano.h +++ b/libusb/version_nano.h @@ -1 +1 @@ -#define LIBUSB_NANO 11795 +#define LIBUSB_NANO 11796 diff --git a/tests/init_context.c b/tests/init_context.c index e7a010e..757afe9 100644 --- a/tests/init_context.c +++ b/tests/init_context.c @@ -109,7 +109,9 @@ static libusb_testlib_result test_init_context_log_level(void) { LIBUSB_TEST_RETURN_ON_ERROR(libusb_init_context(&test_ctx, options, /*num_options=*/1)); +#ifndef ENABLE_DEBUG_LOGGING LIBUSB_EXPECT(==, test_ctx->debug, LIBUSB_LOG_LEVEL_ERROR); +#endif LIBUSB_TEST_CLEAN_EXIT(TEST_STATUS_SUCCESS); } @@ -137,7 +139,9 @@ static libusb_testlib_result test_init_context_log_cb(void) { LIBUSB_TEST_RETURN_ON_ERROR(libusb_init_context(&test_ctx, options, /*num_options=*/1)); +#ifndef ENABLE_DEBUG_LOGGING LIBUSB_EXPECT(==, test_ctx->log_handler, test_log_cb); +#endif LIBUSB_TEST_CLEAN_EXIT(TEST_STATUS_SUCCESS); } diff --git a/tests/set_option.c b/tests/set_option.c index 3c658c6..df2ae1d 100644 --- a/tests/set_option.c +++ b/tests/set_option.c @@ -143,13 +143,17 @@ static libusb_testlib_result test_set_log_level_env(void) { setenv("LIBUSB_DEBUG", "4", /*overwrite=*/0); LIBUSB_TEST_RETURN_ON_ERROR(libusb_init_context(&test_ctx, /*options=*/NULL, /*num_options=*/0)); +#ifndef ENABLE_DEBUG_LOGGING LIBUSB_EXPECT(==, test_ctx->debug, 4); +#endif LIBUSB_TEST_RETURN_ON_ERROR(libusb_set_option(test_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_ERROR)); /* environment variable should always override LIBUSB_OPTION_LOG_LEVEL if set */ +#ifndef ENABLE_DEBUG_LOGGING LIBUSB_EXPECT(==, test_ctx->debug, 4); +#endif LIBUSB_TEST_CLEAN_EXIT(TEST_STATUS_SUCCESS); #else |