Update liblcd:

- fix run on Lunux; - add runs tests;
rozhuk-im · Apr 25, 2024 · 1d10bd7 · 1d10bd7
1 parent 5bdf950
commit 1d10bd7
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 9 deletions.
diff --git a/.github/workflows/build-macos-latest.yml b/.github/workflows/build-macos-latest.yml
@@ -29,6 +29,23 @@ jobs:
       with:
         submodules: 'recursive'
 
+    - name: Install libraries
+      run: |
+        checkPkgAndInstall()
+        {
+          while [ $# -ne 0 ]
+          do
+            rm -f '/usr/local/bin/2to3'
+            if brew ls --versions $1 ; then
+              brew upgrade $1
+            else
+              brew install $1
+            fi
+            shift
+          done
+        }
+        checkPkgAndInstall cunit
+
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
@@ -42,17 +59,17 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_TESTS=1
 
     - name: Build
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
+      run: cmake --build . --config $BUILD_TYPE -j 16
 
     - name: Test
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE -j 16 --output-on-failure
diff --git a/.github/workflows/build-ubuntu-latest.yml b/.github/workflows/build-ubuntu-latest.yml
@@ -29,6 +29,11 @@ jobs:
       with:
         submodules: 'recursive'
 
+    - name: Install libraries
+      run: |
+        sudo apt-get update
+        sudo apt-get install cmake libcunit1 libcunit1-doc libcunit1-dev
+
     - name: Create Build Environment
       # Some projects don't allow in-source building, so create a separate build directory
       # We'll use this as our working directory for all subsequent commands
@@ -42,17 +47,17 @@ jobs:
       # Note the current convention is to use the -S and -B options here to specify source
       # and build directories, but this is only available with CMake 3.13 and higher.
       # The CMake binaries on the Github Actions machines are (as of this writing) 3.12
-      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+      run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DENABLE_TESTS=1
 
     - name: Build
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute the build.  You can specify a specific target with "--target <NAME>"
-      run: cmake --build . --config $BUILD_TYPE
+      run: cmake --build . --config $BUILD_TYPE -j 16
 
     - name: Test
       working-directory: ${{github.workspace}}/build
       shell: bash
       # Execute tests defined by the CMake configuration.  
       # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
-      run: ctest -C $BUILD_TYPE
+      run: ctest -C $BUILD_TYPE -j 16 --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 
 ############################# INITIAL SECTION ##########################
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.20)
 
 project(ssdpd C)
 
@@ -21,7 +21,13 @@ set(PACKAGE_TARNAME		"${PACKAGE_NAME}-${PACKAGE_VERSION}")
 
 ############################# OPTIONS SECTION ##########################
 
-option(INSTALL_PHP_MEDIA_SERVER	"Install PHP UPnP/DLNA Media server [default: ON]"	OFF)
+option(INSTALL_PHP_MEDIA_SERVER	"Install PHP UPnP/DLNA Media server [default: OFF]"	OFF)
+option(ENABLE_TESTS		"Enable tests [default: OFF]"				OFF)
+if (ENABLE_TESTS)
+	# Enable testing functionality.
+	enable_testing()
+	set(ENABLE_LIBLCB_TESTS TRUE)
+endif()
 
 # Now CMAKE_INSTALL_PREFIX is a base prefix for everything.
 if (NOT CONFDIR)
@@ -241,6 +247,10 @@ add_definitions(-DSOCKET_XML_CONFIG)
 include(src/liblcb/CMakeLists.txt)
 add_subdirectory(src)
 
+if (ENABLE_TESTS)
+	#add_subdirectory(tests)
+endif()
+
 ############################ TARGETS SECTION ###########################
 
 add_custom_target(dist ${CMAKE_CURRENT_SOURCE_DIR}/dist.sh

diff --git a/readme.md b/readme.md
@@ -48,6 +48,15 @@ UPnP/DLNA PHP server requires
 2. PHP with fpm, fileinfo, soap, xml.
 
 
+## Run tests
+```
+mkdir -p build
+cd build
+cmake -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=1 ..
+cmake --build . --config Release -j 16
+ctest -C Release --output-on-failure -j 16
+```
+
 ## Usage
 ```
 ssdpd [-d] [-v] [-c file]

diff --git a/src/liblcb b/src/liblcb
+20 −0		.editorconfig
+75 −0		.github/workflows/build-macos-latest.yml
+63 −0		.github/workflows/build-ubuntu-latest.yml
+29 −3		CMakeLists.txt
+158 −13		include/al/os.h
+6 −1		include/crypto/dsa/ecdsa.h
+13 −10		include/crypto/hash/gost3411-2012.h
+5 −1		include/crypto/hash/md5.h
+12 −9		include/crypto/hash/sha1.h
+9 −6		include/crypto/hash/sha2.h
+5 −2		include/math/big_num.h
+1 −1		include/net/host_address.h
+1 −1		include/net/hostname_list.h
+7 −6		include/net/socket.h
+13 −12		include/net/socket_options.h
+31 −24		include/threadpool/threadpool.h
+9 −2		include/threadpool/threadpool_msg_sys.h
+7 −7		include/threadpool/threadpool_task.h
+6 −1		include/utils/base64.h
+1 −1		include/utils/ring_buffer.h
+4 −2		include/utils/sys.h
+10 −2		lib.project
+17 −1		readme.md
+34 −24		src/net/socket.c
+10 −1		src/net/socket_options.c
+3 −2		src/proto/dns_resolv.c
+1 −1		src/proto/http_server.c
+2 −2		src/proto/radius_client.c
+1 −1		src/proto/upnp_ssdp.c
+90 −54		src/threadpool/threadpool.c
+15 −9		src/threadpool/threadpool_msg_sys.c
+12 −12		src/threadpool/threadpool_task.c
+1 −1		src/utils/info.c
+1 −1		src/utils/ring_buffer.c
+179 −24		src/utils/sys.c
+42 −0		tests/CMakeLists.txt
+1 −11		tests/base64/main.c
+1 −12		tests/ecdsa/main.c
+3 −14		tests/hash/main.c
+48 −35		tests/threadpool/main.c
+2 −2		tests/threadpool/test-threadpool.project