diff --git a/Inst_eddies/Tests/long_tests.json b/Inst_eddies/Tests/long_tests.json
index 2bef32881fad1c3f2971561f8789469dd79bc3a9..59a99b27ff3bd0414c15481501762bd5b1c92c53 100644
--- a/Inst_eddies/Tests/long_tests.json
+++ b/Inst_eddies/Tests/long_tests.json
@@ -4,7 +4,7 @@
[
["mkdir", "SHPC_cyclo", "SHPC_anti"],
[
- "$build_dir/Inst_eddies/test_set_all_outerm",
+ "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
"$src_dir/Inst_eddies/Tests/Input/h_region_3.nc"
]
],
diff --git a/Inst_eddies/Tests/short_tests.json b/Inst_eddies/Tests/short_tests.json
index b23f36f405d3ff84a0c43dfb936abb092f86a525..7f6f5d457e19dc34666a8b60b09f112ae91459b6 100644
--- a/Inst_eddies/Tests/short_tests.json
+++ b/Inst_eddies/Tests/short_tests.json
@@ -13,7 +13,7 @@
]
],
"commands":
- [["mkdir", "SHPC"], "$build_dir/Inst_eddies/test_get_1_outerm"]
+ [["mkdir", "SHPC"], "$build_dir/Inst_eddies/Tests/test_get_1_outerm"]
},
{
"description":
@@ -28,7 +28,7 @@
"$src_dir/Inst_eddies/Tests/Input/Region_1/outside_points.csv"
],
"commands":
- [["mkdir", "SHPC"], "$build_dir/Inst_eddies/test_get_1_outerm"]
+ [["mkdir", "SHPC"], "$build_dir/Inst_eddies/Tests/test_get_1_outerm"]
},
{
"description": "Negative value for extremum 2.",
@@ -45,7 +45,7 @@
]
],
"commands":
- [["mkdir", "SHPC"], "$build_dir/Inst_eddies/test_get_1_outerm"]
+ [["mkdir", "SHPC"], "$build_dir/Inst_eddies/Tests/test_get_1_outerm"]
},
{
"description":
@@ -58,7 +58,7 @@
],
"title": "Good_contour",
"command": [
- "$build_dir/Inst_eddies/test_good_contour",
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
"$src_dir/Inst_eddies/Tests/Input/example.nc"
],
"stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour.txt"
@@ -74,7 +74,7 @@
],
"title": "Good_contour_2",
"command": [
- "$build_dir/Inst_eddies/test_good_contour",
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
"$src_dir/Inst_eddies/Tests/Input/example.nc"
],
"stdin_filename": "$src_dir/Inst_eddies/Tests/Input/good_contour_2.txt"
@@ -88,7 +88,7 @@
],
"title": "No_good_contour",
"command": [
- "$build_dir/Inst_eddies/test_good_contour",
+ "$build_dir/Inst_eddies/Tests/test_good_contour",
"$src_dir/Inst_eddies/Tests/Input/example.nc"
],
"stdin_filename": "$src_dir/Inst_eddies/Tests/Input/no_good_contour.txt"
@@ -98,7 +98,7 @@
"$src_dir/Inst_eddies/Tests/Input/inside_4_true_nml.txt",
"title": "Inside_4_true",
"command": [
- "$build_dir/Inst_eddies/test_inside_4",
+ "$build_dir/Inst_eddies/Tests/test_inside_4",
"$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
]
},
@@ -107,7 +107,7 @@
"$src_dir/Inst_eddies/Tests/Input/inside_4_false_nml.txt",
"title": "Inside_4_false",
"command": [
- "$build_dir/Inst_eddies/test_inside_4",
+ "$build_dir/Inst_eddies/Tests/test_inside_4",
"$src_dir/Inst_eddies/Tests/Input/outermost_eddy_5"
]
},
@@ -115,7 +115,7 @@
"input": "f",
"title": "Local_extrema",
"command": [
- "$build_dir/Inst_eddies/test_local_extrema",
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
@@ -124,7 +124,7 @@
"input": "f",
"title": "Local_extrema_larger",
"command": [
- "$build_dir/Inst_eddies/test_local_extrema",
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
"$src_dir/Inst_eddies/Tests/Input/h_region_2.nc"
]
},
@@ -133,7 +133,7 @@
"description": "With input file containing missing values.",
"title": "Local_extrema_missing",
"command": [
- "$build_dir/Inst_eddies/test_local_extrema",
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
"$src_dir/Inst_eddies/Tests/Input/h_region_4.nc"
]
},
@@ -144,7 +144,7 @@
"title": "Local_extrema_periodic",
"command":
[
- "$build_dir/Inst_eddies/test_local_extrema",
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
},
@@ -154,7 +154,7 @@
"input": "t\n",
"title": "Local_extrema_periodic_2",
"command": [
- "$build_dir/Inst_eddies/test_local_extrema",
+ "$build_dir/Inst_eddies/Tests/test_local_extrema",
"$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc"
]
},
@@ -162,7 +162,7 @@
"input": "&main_nml /\n",
"title": "Max_speed_contour_ssh",
"command": [
- "$build_dir/Inst_eddies/test_max_speed_contour_ssh",
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
@@ -173,7 +173,7 @@
"title": "Max_speed_contour_ssh_north",
"command":
[
- "$build_dir/Inst_eddies/test_max_speed_contour_ssh",
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc",
"$src_dir/Inst_eddies/Tests/Input/Region_1/huv_region_1_2006_01_01.nc"
]
@@ -184,7 +184,7 @@
"title": "Max_speed_contour_ssh_missing",
"command":
[
- "$build_dir/Inst_eddies/test_max_speed_contour_ssh",
+ "$build_dir/Inst_eddies/Tests/test_max_speed_contour_ssh",
"$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc",
"$src_dir/Inst_eddies/Tests/Input/huv_2015_11_29.nc"
]
@@ -201,7 +201,7 @@
],
"command":
[
- "$build_dir/Inst_eddies/test_mean_speed",
+ "$build_dir/Inst_eddies/Tests/test_mean_speed",
"$PWD/Get_1_outerm/SHPC/outermost_contour"
]
},
@@ -217,7 +217,7 @@
],
"command":
[
- "$build_dir/Inst_eddies/test_mean_speed",
+ "$build_dir/Inst_eddies/Tests/test_mean_speed",
"$src_dir/Inst_eddies/Tests/Input/outermost_contour_alt"
]
},
@@ -242,7 +242,7 @@
[
["mkdir", "SHPC"],
[
- "$build_dir/Inst_eddies/test_set_max_speed",
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
"$PWD/Get_1_outerm/SHPC"
]
]
@@ -265,7 +265,7 @@
[
["mkdir", "SHPC"],
[
- "$build_dir/Inst_eddies/test_set_max_speed",
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
"$PWD/Get_1_outerm_noise_2_8/SHPC"
]
]
@@ -286,7 +286,7 @@
[
["mkdir", "SHPC"],
[
- "$build_dir/Inst_eddies/test_set_max_speed",
+ "$build_dir/Inst_eddies/Tests/test_set_max_speed",
"$src_dir/Inst_eddies/Tests/Input/SHPC_degenerate"
]
]
@@ -386,7 +386,7 @@
"title": "Nearby_extr",
"command":
[
- "$build_dir/Inst_eddies/test_nearby_extr",
+ "$build_dir/Inst_eddies/Tests/test_nearby_extr",
"$PWD/Inst_eddies_loop/SHPC_cyclo"
],
"description": "We are using Inst_eddies_loop, which is a previous test."
@@ -403,7 +403,7 @@
[
["mkdir", "SHPC_cyclo", "SHPC_anti"],
[
- "$build_dir/Inst_eddies/test_set_all_outerm",
+ "$build_dir/Inst_eddies/Tests/test_set_all_outerm",
"$src_dir/Inst_eddies/Tests/Input/h_2006_01_01_coarse.nc"
]
]
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index b52e2e5f882f7d4b9b8dace7b24ac3be77ed750a..9c6da643fee19a9f628ac2ed1535e28444dd2eaf 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -1,12 +1,12 @@
[
{
"title": "Weight",
- "command": "$build_dir/Overlap/test_weight"
+ "command": "$build_dir/Overlap/Tests/test_weight"
},
{
"title": "Spher_polygon_area",
"command": [
- "$build_dir/Overlap/test_spher_polygon_area",
+ "$build_dir/Overlap/Tests/test_spher_polygon_area",
"$src_dir/Overlap/Tests/Input/triangle"
]
},
@@ -14,7 +14,7 @@
"description": "Area of a multipolygon, with a hole in one polygon.",
"title": "Area_multi_polygon",
"command": [
- "$build_dir/Overlap/test_spher_polygon_area",
+ "$build_dir/Overlap/Tests/test_spher_polygon_area",
"$src_dir/Overlap/Tests/Input/tri_square_hole"
]
},
@@ -29,7 +29,7 @@
"commands":
[
["mkdir", "SHPC"],
- ["$build_dir/Overlap/test_read_eddy"]
+ ["$build_dir/Overlap/Tests/test_read_eddy"]
]
},
{
@@ -41,7 +41,7 @@
"SHPC"
],
[
- "$build_dir/Overlap/test_read_snapshot",
+ "$build_dir/Overlap/Tests/test_read_snapshot",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
]
@@ -52,7 +52,7 @@
"title": "Successive_overlap",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
},
@@ -62,7 +62,7 @@
"title": "Successive_overlap_region_5_one_date",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$PWD/Inst_eddies_4_anti"
]
},
@@ -72,7 +72,7 @@
"title": "Successive_overlap_periodic",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_periodic/SHPC_cyclo"
]
},
@@ -82,7 +82,7 @@
"title": "Successive_overlap_different_snapshots",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
},
@@ -93,7 +93,7 @@
"title": "Successive_overlap_region_2",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_region_2_noise/SHPC_anti"
]
},
@@ -103,7 +103,7 @@
"title": "Successive_overlap_region_5",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$PWD/Inst_eddies_4_anti"
]
},
@@ -113,7 +113,7 @@
"title": "Successive_overlap_global",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$PWD/Inst_eddies_5_anti"
]
},
@@ -123,7 +123,7 @@
"title": "Non_successive_overlap",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
},
@@ -134,7 +134,7 @@
"title": "NSO_different_snapshots",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
},
@@ -145,7 +145,7 @@
"title": "NSO_region_5",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$PWD/Inst_eddies_4_anti"
]
},
@@ -156,7 +156,7 @@
"title": "NSO_global",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$PWD/Inst_eddies_5_anti"
]
},
@@ -166,7 +166,7 @@
"title": "NSO_delta",
"command":
[
- "$build_dir/Overlap/test_overlap",
+ "$build_dir/Overlap/Tests/test_overlap",
"$tests_old_dir/Region_6/SHPC_anti"
]
},
@@ -184,7 +184,7 @@
"$mpiexec",
"-n",
"2",
- "$build_dir/Overlap/test_send_recv",
+ "$build_dir/Overlap/Tests/test_send_recv",
"$tests_old_dir/Extraction_eddies_region_4/SHPC_anti"
]
]
@@ -203,7 +203,7 @@
"$mpiexec",
"-n",
"1",
- "$build_dir/Overlap/test_get_dispatch_snap",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
"$tests_old_dir/Inst_eddies_loop/SHPC_cyclo"
]
]
@@ -222,7 +222,7 @@
"$mpiexec",
"-n",
"2",
- "$build_dir/Overlap/test_get_dispatch_snap",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
"$tests_old_dir/Inst_eddies_loop/SHPC_cyclo"
]
]
diff --git a/Tests/tests.json b/Tests/tests.json
index ef75bedb2ce3a6ef00c8b0a6341017c9cf067033..5154093b1db8d8ffb08c0e6855f5d29e4f935200 100644
--- a/Tests/tests.json
+++ b/Tests/tests.json
@@ -1,6 +1,6 @@
[
{
"title": "Spher_polyline_area",
- "command": "$build_dir/test_spher_polyline_area"
+ "command": "$build_dir/Tests/test_spher_polyline_area"
}
]