diff --git a/.github/workflows/io_gnu.yml b/.github/workflows/io_gnu.yml index 1317bd69c..2a538deee 100644 --- a/.github/workflows/io_gnu.yml +++ b/.github/workflows/io_gnu.yml @@ -107,9 +107,9 @@ jobs: cmake -DSWITCH=${GITHUB_WORKSPACE}/ww3/model/tests/data/switch.io -DCMAKE_BUILD_TYPE=Debug -DCMAKE_Fortran_FLAGS="-g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -Wall -fno-omit-frame-pointer -fsanitize=address" -DCMAKE_C_FLAGS="-g -fprofile-abs-path -fprofile-arcs -ftest-coverage -O0 -Wall -fno-omit-frame-pointer -fsanitize=address" .. make -j2 VERBOSE=1 ./bin/ww3_grid - mv mod_def.ww3 model/tests + mv mod_def.ww3 regtests/unittests ctest --verbose --output-on-failure --rerun-failed - gcovr --root .. -v --html-details --exclude ../model/tests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null + gcovr --root .. -v --html-details --exclude ../regtests/unittests --exclude CMakeFiles --print-summary -o test-coverage.html &> /dev/null - name: upload-test-coverage uses: actions/upload-artifact@v3 diff --git a/CMakeLists.txt b/CMakeLists.txt index 126f6faf8..5436f9cb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,5 +62,5 @@ add_subdirectory(model) # Turn on unit testing. include(CTest) if(BUILD_TESTING) - add_subdirectory(model/tests) + add_subdirectory(regtests/unittests) endif() diff --git a/model/tests/CMakeLists.txt b/regtests/unittests/CMakeLists.txt similarity index 100% rename from model/tests/CMakeLists.txt rename to regtests/unittests/CMakeLists.txt diff --git a/model/tests/data/switch.io b/regtests/unittests/data/switch.io similarity index 100% rename from model/tests/data/switch.io rename to regtests/unittests/data/switch.io diff --git a/model/tests/data/ww3_grid.inp b/regtests/unittests/data/ww3_grid.inp similarity index 100% rename from model/tests/data/ww3_grid.inp rename to regtests/unittests/data/ww3_grid.inp diff --git a/model/tests/data/ww3_outp.inp b/regtests/unittests/data/ww3_outp.inp similarity index 100% rename from model/tests/data/ww3_outp.inp rename to regtests/unittests/data/ww3_outp.inp diff --git a/model/tests/test_io_points_bin.F90 b/regtests/unittests/test_io_points_bin.F90 similarity index 100% rename from model/tests/test_io_points_bin.F90 rename to regtests/unittests/test_io_points_bin.F90