From 1cfca6ce47f2bf1e397abe6697a6d4edf5010e6e Mon Sep 17 00:00:00 2001 From: Robert Schmidt Date: Mon, 8 Sep 2025 14:59:16 +0200 Subject: [PATCH] Move PhySim definition to openair1/SIMULATION/tests Most (but not all) physical simulators are defined under openair1/SIMULATION/. Defining physical simulators below there seems to be the more "obvious" directory anyway, as the physical simulators are openair1/SIMULATION/tests Phy(L1) Sim tests => PhySim (tests) --- doc/physical-simulators.md | 2 +- docker/Dockerfile.phySim.rhel9 | 2 +- openair1/CMakeLists.txt | 1 + openair1/PHY/CODING/CMakeLists.txt | 4 ---- openair1/SIMULATION/CMakeLists.txt | 3 +++ openair1/{PHY/CODING => SIMULATION}/tests/CMakeLists.txt | 0 6 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 openair1/SIMULATION/CMakeLists.txt rename openair1/{PHY/CODING => SIMULATION}/tests/CMakeLists.txt (100%) diff --git a/doc/physical-simulators.md b/doc/physical-simulators.md index 600f46191e..bf537b1fbd 100644 --- a/doc/physical-simulators.md +++ b/doc/physical-simulators.md @@ -100,7 +100,7 @@ ctest -L nr_ulsch -j 4 To define a new test or modify existing ones, update the following file: ``` -openair1/PHY/CODING/tests/CMakeLists.txt +openair1/SIMULATION/tests/CMakeLists.txt ``` Use the `add_physim_test` macro with the following arguments: diff --git a/docker/Dockerfile.phySim.rhel9 b/docker/Dockerfile.phySim.rhel9 index e9ccf68b00..c5faab2ec7 100644 --- a/docker/Dockerfile.phySim.rhel9 +++ b/docker/Dockerfile.phySim.rhel9 @@ -98,7 +98,7 @@ RUN ldconfig && \ WORKDIR /opt/oai-physim/ COPY --from=phy-sim-build \ - /oai-ran/cmake_targets/ran_build/build/openair1/PHY/CODING/tests/CTestTestfile.cmake \ + /oai-ran/cmake_targets/ran_build/build/openair1/SIMULATION/tests/CTestTestfile.cmake \ /opt/oai-physim/ #CMD ["sleep", "infinity"] diff --git a/openair1/CMakeLists.txt b/openair1/CMakeLists.txt index 1ce6debaf1..123d723342 100644 --- a/openair1/CMakeLists.txt +++ b/openair1/CMakeLists.txt @@ -1 +1,2 @@ add_subdirectory(PHY) +add_subdirectory(SIMULATION) diff --git a/openair1/PHY/CODING/CMakeLists.txt b/openair1/PHY/CODING/CMakeLists.txt index 5b7508fc29..7e07f8f2dc 100644 --- a/openair1/PHY/CODING/CMakeLists.txt +++ b/openair1/PHY/CODING/CMakeLists.txt @@ -68,7 +68,3 @@ if (ENABLE_LDPC_CUDA) endif() add_subdirectory(nrLDPC_coding) - -if(ENABLE_PHYSIM_TESTS) - add_subdirectory(tests) -endif() diff --git a/openair1/SIMULATION/CMakeLists.txt b/openair1/SIMULATION/CMakeLists.txt new file mode 100644 index 0000000000..b93118ccb7 --- /dev/null +++ b/openair1/SIMULATION/CMakeLists.txt @@ -0,0 +1,3 @@ +if(ENABLE_PHYSIM_TESTS) + add_subdirectory(tests) +endif() diff --git a/openair1/PHY/CODING/tests/CMakeLists.txt b/openair1/SIMULATION/tests/CMakeLists.txt similarity index 100% rename from openair1/PHY/CODING/tests/CMakeLists.txt rename to openair1/SIMULATION/tests/CMakeLists.txt