yuzu/libusb
1
0
Fork 0
mirror of https://github.com/libusb/libusb synced 2024-11-21 14:29:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

tests/set_option: Allow no devices in test_no_discovery

Browse source 
Instead of assuming there will always be some devices detected (when not
using LIBUSB_OPTION_NO_DEVICE_DISCOVERY), let the test pass but print a
warning to the user if there is none. This is to allow automated build
tests on restricted build environments without USB devices.

References #1374
Closes #1379
This commit is contained in:
Ingvar Stepanyan 2023-12-13 14:30:33 +00:00 committed by Tormod Volden
parent b27247063b
commit c2e150773e
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.private/ci-build.sh
View file

@ -63,9 +63,6 @@ cflags+=" -Wpointer-arith"
cflags+=" -Wredundant-decls"
cflags+=" -Wswitch-enum"
# Tell tests that we don't have any devices.
cflags+=" -DCI_WITHOUT_DEVICES"
# enable address sanitizer
if [ "${asan}" = "yes" ]; then
cflags+=" -fsanitize=address"

2
libusb/version_nano.h
View file

@ -1 +1 @@
#define LIBUSB_NANO 11851
#define LIBUSB_NANO 11852

8
tests/set_option.c
View file

@ -166,7 +166,7 @@ static libusb_testlib_result test_set_log_level_env(void) {
static libusb_testlib_result test_no_discovery(void)
{
#if defined(__linux__) && !defined(CI_WITHOUT_DEVICES)
#if defined(__linux__)
libusb_context *test_ctx;
LIBUSB_TEST_RETURN_ON_ERROR(libusb_init_context(&test_ctx, /*options=*/NULL,
/*num_options=*/0));
@ -176,7 +176,11 @@ static libusb_testlib_result test_no_discovery(void)
libusb_exit(test_ctx);
test_ctx = NULL;
LIBUSB_EXPECT(>, num_devices, 0);
if (num_devices == 0) {
libusb_testlib_logf("Warning: no devices found, the test will only verify that setting LIBUSB_OPTION_NO_DEVICE_DISCOVERY succeeds.");
}
LIBUSB_EXPECT(>=, num_devices, 0);
LIBUSB_TEST_RETURN_ON_ERROR(libusb_set_option(NULL, LIBUSB_OPTION_NO_DEVICE_DISCOVERY));
LIBUSB_TEST_RETURN_ON_ERROR(libusb_init_context(&test_ctx, /*options=*/NULL,