From dabc4b0054b1c2be2528381ada562ed7fad03234 Mon Sep 17 00:00:00 2001
From: Lionel GUEZ <guez@lmd.ens.fr>
Date: Tue, 22 Nov 2022 12:49:36 +0100
Subject: [PATCH] Bug fix: correct paths to executable files
---
Inst_eddies/Tests/test_output.json | 16 ++++++++--------
Overlap/Tests/short_tests.json | 18 +++++++++---------
2 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Inst_eddies/Tests/test_output.json b/Inst_eddies/Tests/test_output.json
index f8517bcb..a66cdf3a 100644
--- a/Inst_eddies/Tests/test_output.json
+++ b/Inst_eddies/Tests/test_output.json
@@ -3,7 +3,7 @@
"title": "Medium_mix",
"description": "Append to medium-sized SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": [["$PWD/n_dates_14", "SHPC"]],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -13,7 +13,7 @@
"title": "Small_mix",
"description": "Append to small SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": [["$PWD/n_dates_1", "SHPC"]],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -22,7 +22,7 @@
"title": "Medium_sep",
"description": "Append to medium-sized SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": [["$PWD/n_dates_14", "SHPC"]],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -31,7 +31,7 @@
"title": "Small_sep",
"description": "Append to small SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": [["$PWD/n_dates_1", "SHPC"]],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -43,7 +43,7 @@
"commands" :
[
["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/Inst_eddies/Tests/test_write_null"]
+ ["time", "$build_dir/test_write_null"]
],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -55,7 +55,7 @@
"commands" :
[
["mkdir", "-p", "SHPC/Slice_0/Cyclones"],
- ["time", "$build_dir/Inst_eddies/Tests/test_write_null"]
+ ["time", "$build_dir/test_write_null"]
],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -64,7 +64,7 @@
"title": "Big_mix",
"description": "Append to big SHPC, mixing output to the three shapefiles.",
"input": "&main_nml /\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": ["$PWD/Inst_eddies_9/SHPC"],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
@@ -73,7 +73,7 @@
"title": "Big_sep",
"description": "Append to big SHPC, separating output to the three shapefiles.",
"input": "&main_nml mixed = f/\n",
- "command" : ["time", "$build_dir/Inst_eddies/Tests/test_write_null"],
+ "command" : ["time", "$build_dir/test_write_null"],
"copy": ["$PWD/Inst_eddies_9/SHPC"],
"stdout": "test_write_null_stdout.txt",
"exclude_cmp": ["test_write_null_stderr.txt"]
diff --git a/Overlap/Tests/short_tests.json b/Overlap/Tests/short_tests.json
index de737b46..64fb94a4 100644
--- a/Overlap/Tests/short_tests.json
+++ b/Overlap/Tests/short_tests.json
@@ -20,7 +20,7 @@
[
["mkdir", "-p", "SHPC/Slice_0/Anticyclones"],
[
- "$build_dir/Inst_eddies/test_read_eddy",
+ "$build_dir/Overlap/Tests/test_read_eddy",
"$tests_old_dir/Extraction_eddies_region_4/SHPC"
]
],
@@ -35,7 +35,7 @@
"SHPC/Slice_0/Cyclones"
],
[
- "$build_dir/Inst_eddies/test_read_snapshot",
+ "$build_dir/Overlap/Tests/test_read_snapshot",
"$tests_old_dir/Extraction_eddies_region_4/SHPC"
]
]
@@ -179,7 +179,7 @@
"$mpiexec",
"-n",
"2",
- "$build_dir/Inst_eddies/test_send_recv",
+ "$build_dir/Overlap/Tests/test_send_recv",
"$tests_old_dir/Extraction_eddies_region_4/SHPC"
]
]
@@ -197,7 +197,7 @@
"$mpiexec",
"-n",
"1",
- "$build_dir/Inst_eddies/test_get_dispatch_snap",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
"$tests_old_dir/Inst_eddies_loop/SHPC"
]
]
@@ -216,7 +216,7 @@
"$mpiexec",
"-n",
"2",
- "$build_dir/Inst_eddies/test_get_dispatch_snap",
+ "$build_dir/Overlap/Tests/test_get_dispatch_snap",
"$tests_old_dir/Inst_eddies_loop/SHPC"
]
]
@@ -502,7 +502,7 @@
[
["mkdir", "-p", "SHPC/Slice_0/Anticyclones"],
[
- "$build_dir/Inst_eddies/test_read_eddy",
+ "$build_dir/Overlap/Tests/test_read_eddy",
"$PWD/Inst_eddies_4"
]
],
@@ -518,7 +518,7 @@
"SHPC/Slice_0/Cyclones"
],
[
- "$build_dir/Inst_eddies/test_read_snapshot",
+ "$build_dir/Overlap/Tests/test_read_snapshot",
"$PWD/Inst_eddies_10"
]
]
@@ -533,7 +533,7 @@
"SHPC/Slice_0/Cyclones"
],
[
- "$build_dir/Inst_eddies/test_read_snapshot",
+ "$build_dir/Overlap/Tests/test_read_snapshot",
"$PWD/Inst_eddies_10"
]
]
@@ -548,7 +548,7 @@
"SHPC/Slice_0/Cyclones"
],
[
- "$build_dir/Inst_eddies/test_read_snapshot",
+ "$build_dir/Overlap/Tests/test_read_snapshot",
"$PWD/Inst_eddies_10_splitted"
]
]
--
GitLab