git status

cmuhammedrafi · Aug 27, 2024 · a400b18 · a400b18
1 parent 5b8d1df
commit a400b18
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/.github/workflows/L1-NetworkManager.yml b/.github/workflows/L1-NetworkManager.yml
@@ -153,7 +153,7 @@ jobs:
       - name: Generate external headers
         # Empty headers to mute errors
         run: >
-          cd "${{github.workspace}}/rdkservices/Tests/"
+          cd "${{github.workspace}}/rdkservices/NetworkManager/Tests/"
           &&
           mkdir -p
           headers
@@ -171,27 +171,27 @@ jobs:
   
       - name: Set clang toolchain
         if: ${{ matrix.compiler == 'clang' }}
-        run: echo "TOOLCHAIN_FILE=${{github.workspace}}/rdkservices/Tests/clang.cmake" >> $GITHUB_ENV
+        run: echo "TOOLCHAIN_FILE=${{github.workspace}}/rdkservices/NetworkManager/Tests/clang.cmake" >> $GITHUB_ENV
 
       - name: Set gcc/with-coverage toolchain
         if: ${{ matrix.compiler == 'gcc' && matrix.coverage == 'with-coverage' && !env.ACT }}
-        run: echo "TOOLCHAIN_FILE=${{github.workspace}}/rdkservices/Tests/gcc-with-coverage.cmake" >> $GITHUB_ENV
+        run: echo "TOOLCHAIN_FILE=${{github.workspace}}/rdkservices/NetworkManager/Tests/gcc-with-coverage.cmake" >> $GITHUB_ENV
 
       - name: Build NetworkManager
         run: >
           cmake
-          -S "${{github.workspace}}/rdkservices"
-          -B build/rdkservices
+          -S "${{github.workspace}}/rdkservices/NetworkManager"
+          -B build/rdkservices/NetworkManager
           -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}"
           -DCMAKE_INSTALL_PREFIX="${{github.workspace}}/install/usr"
           -DCMAKE_MODULE_PATH="${{github.workspace}}/install/tools/cmake"
           -DCMAKE_CXX_FLAGS="
           -fprofile-arcs
           -ftest-coverage
           -DEXCEPTIONS_ENABLE=ON
-          -I ${{github.workspace}}/Tests/headers
-          -I ${{github.workspace}}/Tests/headers/rdk/iarmbus
-          -I ${{github.workspace}}/Tests/headers/network
+          -I ${{github.workspace}}/rdkservices/NetworkManager/Tests/headers
+          -I ${{github.workspace}}/rdkservices/NetworkManager/Tests/headers/rdk/iarmbus
+          -I ${{github.workspace}}/rdkservices/NetworkManager/Tests/headers/network
           -Wall -Werror -Wno-error=format=
           -Wl,-wrap,system -Wl,-wrap,popen -Wl,-wrap,syslog"
           -DCOMCAST_CONFIG=OFF
@@ -202,6 +202,6 @@ jobs:
           -DPLUGIN_NETWORKMANAGER=ON
           -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
           &&
-          cmake --build build/rdkservices -j16
+          cmake --build build/rdkservices/NetworkManager -j16
           &&
-          cmake --install build/rdkservices
+          cmake --install build/rdkservices/NetworkManager
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -404,7 +404,6 @@ endif()
 if(PLUGIN_NETWORKMANAGER)
     include(l1networkmanager.cmake)
     add_subdirectory(NetworkManager)
-  #  add_subdirectory(Tests/L1Tests)
 endif()
 
 if(WPEFRAMEWORK_CREATE_IPKG_TARGETS)

diff --git a/l1networkmanager.cmake b/l1networkmanager.cmake
@@ -2,7 +2,7 @@ message("Building for unit tests...")
 
 message("Generating empty headers to suppress compiler errors")
 
-file(GLOB BASEDIR Tests)
+file(GLOB BASEDIR NetworkManager/Tests)
 set(BASEDIR ${BASEDIR}/headers)
 set(EMPTY_HEADERS_DIRS
         ${BASEDIR}
@@ -33,7 +33,7 @@ include_directories(${EMPTY_HEADERS_DIRS})
 
 message("Adding compiler and linker options for all targets")
 
-file(GLOB BASEDIR Tests/mocks)
+file(GLOB BASEDIR NetworkManager/Tests/mocks)
 set(FAKE_HEADERS
         ${BASEDIR}/Iarm.h
         )