Merge 63bbb15 into 1c4ab78

Author: user01010111

NEWS.adoc

@@ -77,6 +77,10 @@ https://github.com/networkupstools/nut/milestone/13
         disabled as a result. The names it tried, and why each one failed,
         are logged at debug level 1 instead, since a failed name followed by
         a working one is not a failure. [PR #3739]
+      - Consolidated repeated library selection into a shared helper with
+        explicit candidate lists, preserving lookup order and loading
+        behavior. Added regression tests for library selection, initialization
+        and cleanup. [PR #3760]
       - When the NUT client library was not found under its known file names
         and had to be loaded by the libtool default search instead, the
         result was stored as the availability of the XML/HTTP scan. So the

tests/Makefile.am

@@ -312,6 +312,69 @@ endif !WITH_OPENSSL
 endif WITH_SSL
 endif WITH_SNMP
 
+# Exercise the actual scanner library-selection path without loading devices.
+if WITH_NUT_SCANNER
+NUTSCAN_TEST_CFLAGS = $(AM_CFLAGS) $(LIBLTDL_CFLAGS) -I$(top_srcdir)/tools/nut-scanner -I$(top_srcdir)/clients -I$(top_builddir)/clients
+NUTSCAN_SELECTION_TEST_LDADD = $(NUT_LIBCOMMON) $(LIBLTDL_LIBS) $(NETLIBS)
+$(top_builddir)/clients/libupsclient-version.h: $(top_builddir)/clients/libupsclient.la
+	+@cd $(@D) && $(MAKE) $(AM_MAKEFLAGS) $(@F)
+nutscan-selection-test.c: $(top_builddir)/clients/libupsclient-version.h
+
+TESTS += nutscan-selection-test
+nutscan_selection_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=0
+nutscan_selection_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-distinct-test
+nutscan_selection_distinct_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_distinct_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=1
+nutscan_selection_distinct_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_distinct_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-equal-test
+nutscan_selection_equal_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_equal_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=2
+nutscan_selection_equal_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_equal_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-no-soname-test
+nutscan_selection_no_soname_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_no_soname_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=3
+nutscan_selection_no_soname_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_no_soname_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-no-file-test
+nutscan_selection_no_file_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_no_file_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=4
+nutscan_selection_no_file_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_no_file_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-alias-test
+nutscan_selection_alias_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_alias_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=5
+nutscan_selection_alias_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_alias_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-usb01-test
+nutscan_selection_usb01_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_usb01_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=6
+nutscan_selection_usb01_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_usb01_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-static-test
+nutscan_selection_static_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_static_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=7
+nutscan_selection_static_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_static_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+
+TESTS += nutscan-selection-disabled-test
+nutscan_selection_disabled_test_SOURCES = nutscan-selection-test.c
+nutscan_selection_disabled_test_CFLAGS = $(NUTSCAN_TEST_CFLAGS) -DNUTSCAN_SELECTION_VARIANT=8
+nutscan_selection_disabled_test_LDADD = $(NUTSCAN_SELECTION_TEST_LDADD)
+nutscan_selection_disabled_test_DEPENDENCIES = $(top_srcdir)/tools/nut-scanner/nutscan-init.c $(top_builddir)/clients/libupsclient-version.h $(NUT_LIBCOMMON)
+endif WITH_NUT_SCANNER
+
 ### Optional tests which can not be built everywhere
 # List of src files for CppUnit tests
 CPPUNITTESTSRC = example.cpp nutclienttest.cpp