From 1ff41de3eb35526688566a81f9ccbb1670bc40eb Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Mon, 14 Oct 2019 15:44:27 +0200 Subject: [PATCH] Avoid use of include/ directory in test data --- CMakeLists_files.cmake | 5 +++++ tests/UDQ_ACTIONX_TEST1.DATA | 10 +++++----- .../example_pvt.txt => include_example_pvt.txt} | 0 ...example_summary.txt => include_example_summary.txt} | 0 .../test_3x5x4.grdecl => include_grid_3x5x4.grdecl} | 0 tests/{include/sgof.txt => include_sgof.txt} | 0 tests/{include/swof.txt => include_swof.txt} | 0 7 files changed, 10 insertions(+), 5 deletions(-) rename tests/{include/example_pvt.txt => include_example_pvt.txt} (100%) rename tests/{include/example_summary.txt => include_example_summary.txt} (100%) rename tests/{include/test_3x5x4.grdecl => include_grid_3x5x4.grdecl} (100%) rename tests/{include/sgof.txt => include_sgof.txt} (100%) rename tests/{include/swof.txt => include_swof.txt} (100%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index a117e63bb..13cb558f0 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -374,6 +374,11 @@ if(ENABLE_ECL_OUTPUT) tests/SOFR_TEST.DATA tests/UDQ_TEST_WCONPROD_IUAD-2.DATA tests/UDQ_ACTIONX_TEST1.DATA + tests/include_example_pvt.txt + tests/include_example_summary.txt + tests/include_sgof.txt + tests/include_swof.txt + tests/include_grid_3x5x4.grdecl ) endif() diff --git a/tests/UDQ_ACTIONX_TEST1.DATA b/tests/UDQ_ACTIONX_TEST1.DATA index 7722e805a..8b5d2e1bf 100644 --- a/tests/UDQ_ACTIONX_TEST1.DATA +++ b/tests/UDQ_ACTIONX_TEST1.DATA @@ -150,7 +150,7 @@ NOECHO -- ---------------------------------------------------- --Include simulation grid INCLUDE - 'include/test_3x5x4.grdecl' / + 'include_grid_3x5x4.grdecl' / @@ -208,17 +208,17 @@ PROPS -- *************************************************** INCLUDE - 'include/sgof.txt' / + 'include_sgof.txt' / INCLUDE - 'include/swof.txt' / + 'include_swof.txt' / -- --------------------------------------------------- -- Include PVT data INCLUDE - 'include/example_pvt.txt' / + 'include_example_pvt.txt' / @@ -300,7 +300,7 @@ SUMMARY -- ************************************************************************************** INCLUDE - 'include/example_summary.txt' / + 'include_example_summary.txt' / FMWIN diff --git a/tests/include/example_pvt.txt b/tests/include_example_pvt.txt similarity index 100% rename from tests/include/example_pvt.txt rename to tests/include_example_pvt.txt diff --git a/tests/include/example_summary.txt b/tests/include_example_summary.txt similarity index 100% rename from tests/include/example_summary.txt rename to tests/include_example_summary.txt diff --git a/tests/include/test_3x5x4.grdecl b/tests/include_grid_3x5x4.grdecl similarity index 100% rename from tests/include/test_3x5x4.grdecl rename to tests/include_grid_3x5x4.grdecl diff --git a/tests/include/sgof.txt b/tests/include_sgof.txt similarity index 100% rename from tests/include/sgof.txt rename to tests/include_sgof.txt diff --git a/tests/include/swof.txt b/tests/include_swof.txt similarity index 100% rename from tests/include/swof.txt rename to tests/include_swof.txt