5 files changed, 22 insertions, 26 deletions
diff --git a/src/plugins/hs_apps/CMakeLists.txt b/src/plugins/hs_apps/CMakeLists.txt
index d27c8512306..e7885c3d1bf 100644
--- a/src/plugins/hs_apps/CMakeLists.txt
+++ b/src/plugins/hs_apps/CMakeLists.txt
@@ -19,3 +19,25 @@ add_vpp_plugin(hs_apps
   http_server.c
   proxy.c
 )
+
+option(VPP_BUILD_SESSION_ECHO_APPS "Build session echo apps." ON)
+if(VPP_BUILD_SESSION_ECHO_APPS)
+  add_vpp_executable(tcp_echo
+    SOURCES tcp_echo.c
+    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
+    DEPENDS api_headers
+    NO_INSTALL
+  )
+  add_vpp_executable(quic_echo
+    SOURCES quic_echo.c
+    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
+    DEPENDS api_headers
+    NO_INSTALL
+  )
+  add_vpp_executable(udp_echo
+    SOURCES udp_echo.c
+    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
+    DEPENDS api_headers
+    NO_INSTALL
+  )
+endif(VPP_BUILD_SESSION_ECHO_APPS)
diff --git a/src/tests/vnet/session/quic_echo.c b/src/plugins/hs_apps/quic_echo.c
index a62af642b2f..a62af642b2f 100644
--- a/src/tests/vnet/session/quic_echo.c
+++ b/src/plugins/hs_apps/quic_echo.c
diff --git a/src/tests/vnet/session/tcp_echo.c b/src/plugins/hs_apps/tcp_echo.c
index 6c3ce928490..6c3ce928490 100644
--- a/src/tests/vnet/session/tcp_echo.c
+++ b/src/plugins/hs_apps/tcp_echo.c
diff --git a/src/tests/vnet/session/udp_echo.c b/src/plugins/hs_apps/udp_echo.c
index c9992befe98..c9992befe98 100644
--- a/src/tests/vnet/session/udp_echo.c
+++ b/src/plugins/hs_apps/udp_echo.c
diff --git a/src/vnet/CMakeLists.txt b/src/vnet/CMakeLists.txt
index 467d82b2bf0..5e1a75f9e75 100644
--- a/src/vnet/CMakeLists.txt
+++ b/src/vnet/CMakeLists.txt
@@ -1551,29 +1551,3 @@ add_vpp_library(vnet
 )
 
 ##############################################################################
-# Session echo apps
-##############################################################################
-
-option(VPP_BUILD_SESSION_ECHO_APPS "Build session echo apps." ON)
-if(VPP_BUILD_SESSION_ECHO_APPS)
-  add_vpp_executable(tcp_echo
-    SOURCES ../tests/vnet/session/tcp_echo.c
-    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
-    DEPENDS api_headers
-    NO_INSTALL
-    )
-  add_vpp_executable(quic_echo
-    SOURCES ../tests/vnet/session/quic_echo.c
-    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
-    DEPENDS api_headers
-    NO_INSTALL
-    )
-  add_vpp_executable(udp_echo
-    SOURCES ../tests/vnet/session/udp_echo.c
-    LINK_LIBRARIES vlibmemoryclient svm vppinfra pthread m rt
-    DEPENDS api_headers
-    NO_INSTALL
-    )
-endif(VPP_BUILD_SESSION_ECHO_APPS)
-
-##############################################################################