janis/aes67-daemon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use 3rdparty/ravenna-alsa-lkm via a submodule.

Browse Source 
Fix to the daemon regression test.
This commit is contained in:
Andrea Bondavalli 2024-09-16 12:05:22 +02:00
parent 04ea7f7f19
commit 969e343309
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -1,3 +1,7 @@
[submodule "3rdparty/cpp-httplib"] [submodule "3rdparty/cpp-httplib"]
path = 3rdparty/cpp-httplib path = 3rdparty/cpp-httplib
url = https://github.com/bondagit/cpp-httplib.git url = https://github.com/bondagit/cpp-httplib.git
[submodule "3rdparty/ravenna-alsa-lkm"]
path = 3rdparty/ravenna-alsa-lkm
url = https://github.com/bondagit/ravenna-alsa-lkm.git
branch = aes67-daemon

1
3rdparty/ravenna-alsa-lkm vendored Submodule

@ -0,0 +1 @@
Subproject commit 989728785990592cd3544e54d767beab97366fc6

8
build.sh
View File

@ -12,14 +12,6 @@ TOPDIR=$(pwd)
echo "Init git submodules ..." echo "Init git submodules ..."
git submodule update --init --recursive git submodule update --init --recursive
cd 3rdparty
if [ ! -d ravenna-alsa-lkm ]; then
git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git
cd ravenna-alsa-lkm/driver
make
cd ../..
fi
cd webui cd webui
echo "Downloading current webui release ..." echo "Downloading current webui release ..."
wget --timestamping https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz wget --timestamping https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz

7
buildfake.sh
View File

@ -12,12 +12,6 @@ TOPDIR=$(pwd)
git config --global http.sslverify false git config --global http.sslverify false
git submodule update --init --recursive git submodule update --init --recursive
cd 3rdparty
if [ ! -d ravenna-alsa-lkm ]; then
git clone --single-branch --branch aes67-daemon https://github.com/bondagit/ravenna-alsa-lkm.git
fi
cd ..
cd daemon cd daemon
echo "Building aes67-daemon ..." echo "Building aes67-daemon ..."
cmake \ cmake \
@ -26,6 +20,7 @@ cmake \
-DENABLE_TESTS=ON \ -DENABLE_TESTS=ON \
-DWITH_AVAHI=OFF \ -DWITH_AVAHI=OFF \
-DFAKE_DRIVER=ON \ -DFAKE_DRIVER=ON \
-DWITH_STREAMER=OFF \
. .
make make
cd .. cd ..

2
daemon/tests/daemon.conf
View File

@ -17,7 +17,7 @@
"syslog_server": "255.255.255.254:1234", "syslog_server": "255.255.255.254:1234",
"status_file": "", "status_file": "",
"interface_name": "lo", "interface_name": "lo",
"mdns_enabled": true, "mdns_enabled": false,
"custom_node_id": "test node", "custom_node_id": "test node",
"node_id": "test node", "node_id": "test node",
"ptp_status_script": "", "ptp_status_script": "",

2
daemon/tests/daemon_test.cpp
View File

@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(get_config) {
BOOST_CHECK_MESSAGE(node_id == "test node", "config as excepcted"); BOOST_CHECK_MESSAGE(node_id == "test node", "config as excepcted");
BOOST_CHECK_MESSAGE(custom_node_id == "test node", "config as excepcted"); BOOST_CHECK_MESSAGE(custom_node_id == "test node", "config as excepcted");
BOOST_CHECK_MESSAGE(auto_sinks_update == true, "config as excepcted"); BOOST_CHECK_MESSAGE(auto_sinks_update == true, "config as excepcted");
BOOST_CHECK_MESSAGE(mdns_enabled == true, "config as excepcted"); BOOST_CHECK_MESSAGE(mdns_enabled == false, "config as excepcted");
BOOST_CHECK_MESSAGE(streamer_enabled == false, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_enabled == false, "config as excepcted");
BOOST_CHECK_MESSAGE(streamer_channels == 8, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_channels == 8, "config as excepcted");
BOOST_CHECK_MESSAGE(streamer_files_num == 6, "config as excepcted"); BOOST_CHECK_MESSAGE(streamer_files_num == 6, "config as excepcted");