From 85498d0ea28e3c56460cc1bd91f778ce2b8dd5ba Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <dmitri.naumov@ufz.de>
Date: Mon, 12 Mar 2018 17:50:25 +0100
Subject: [PATCH] [PL] Tests; Remove trailing slashes in PATHs.
On windows this results in double slashes and seemingly a not
valid path.
---
Applications/Utils/Tests.cmake | 4 ++--
ProcessLib/ComponentTransport/Tests.cmake | 24 +++++++++----------
.../RichardsComponentTransport/Tests.cmake | 4 ++--
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index 7ea698dbf69..f476a07b872 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -1,7 +1,7 @@
AddTest(
NAME MapGeometryToMeshSurface_Ammer
- PATH MeshGeoToolsLib/Ammer/
+ PATH MeshGeoToolsLib/Ammer
EXECUTABLE MapGeometryToMeshSurface
EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
TESTER diff
@@ -11,7 +11,7 @@ AddTest(
AddTest(
NAME LARGE_MapGeometryToMeshSurface_Bode
- PATH MeshGeoToolsLib/Bode/
+ PATH MeshGeoToolsLib/Bode
EXECUTABLE MapGeometryToMeshSurface
EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
REQUIREMENTS NOT OGS_USE_MPI
diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 6aad32c5394..b1e59587d21 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -1,6 +1,6 @@
AddTest(
NAME 2D_ComponentTransport_ConcentrationDiffusionOnly
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS ConcentrationDiffusionOnly.prj
WRAPPER time
@@ -15,7 +15,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_ConcentrationDiffusionAndStorage
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS ConcentrationDiffusionAndStorage.prj
WRAPPER time
@@ -33,7 +33,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_DiffusionAndStorageAndAdvection
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS DiffusionAndStorageAndAdvection.prj
WRAPPER time
@@ -66,7 +66,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_DiffusionAndStorageAndGravityAndDispersionHalf
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS DiffusionAndStorageAndGravityAndDispersionHalf.prj
WRAPPER time
@@ -99,7 +99,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_DiffusionAndStorageAndAdvectionAndDispersion
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS DiffusionAndStorageAndAdvectionAndDispersion.prj
WRAPPER time
@@ -132,7 +132,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_DiffusionAndStorageAndAdvectionAndDecay
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS DiffusionAndStorageAndAdvectionAndDecay.prj
WRAPPER time
@@ -165,7 +165,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_DiffusionAndStorageAndAdvectionAndDispersionHalf
- PATH Parabolic/ComponentTransport/SimpleSynthetics/
+ PATH Parabolic/ComponentTransport/SimpleSynthetics
EXECUTABLE ogs
EXECUTABLE_ARGS DiffusionAndStorageAndAdvectionAndDispersionHalf.prj
WRAPPER time
@@ -198,7 +198,7 @@ AddTest(
AddTest(
NAME LARGE_2D_ComponentTransport_Goswami
- PATH Parabolic/ComponentTransport/goswami/
+ PATH Parabolic/ComponentTransport/goswami
EXECUTABLE ogs
EXECUTABLE_ARGS goswami_input.prj
WRAPPER time
@@ -234,7 +234,7 @@ AddTest(
AddTest(
NAME LARGE_2D_ComponentTransport_Elder
- PATH Parabolic/ComponentTransport/elder/
+ PATH Parabolic/ComponentTransport/elder
EXECUTABLE ogs
EXECUTABLE_ARGS elder.prj
WRAPPER time
@@ -297,7 +297,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_HeterogeneousPermeability
- PATH Elliptic/square_100x100_ComponentTransport/
+ PATH Elliptic/square_100x100_ComponentTransport
EXECUTABLE ogs
EXECUTABLE_ARGS square_1e4_heterogeneity.prj
WRAPPER time
@@ -311,7 +311,7 @@ AddTest(
AddTest(
NAME 2D_ComponentTransport_HeterogeneousPermeability_Comparison_OGS5
- PATH Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/
+ PATH Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D
EXECUTABLE ogs
EXECUTABLE_ARGS ogs5_H_2d.prj
WRAPPER time
@@ -325,7 +325,7 @@ AddTest(
AddTest(
NAME 3D_ComponentTransport_HeterogeneousPermeability_Comparison_OGS5
- PATH Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/
+ PATH Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D
EXECUTABLE ogs
EXECUTABLE_ARGS ogs5_H_3d.prj
WRAPPER time
diff --git a/ProcessLib/RichardsComponentTransport/Tests.cmake b/ProcessLib/RichardsComponentTransport/Tests.cmake
index a0f6c288db4..266e3382e72 100644
--- a/ProcessLib/RichardsComponentTransport/Tests.cmake
+++ b/ProcessLib/RichardsComponentTransport/Tests.cmake
@@ -1,6 +1,6 @@
AddTest(
NAME RichardsComponentTransport_1D_Padilla_NaCl1
- PATH Parabolic/RichardsComponentTransport/Padilla/
+ PATH Parabolic/RichardsComponentTransport/Padilla
EXECUTABLE ogs
EXECUTABLE_ARGS Padilla_NaCl1.prj
WRAPPER time
@@ -151,7 +151,7 @@ AddTest(
AddTest(
NAME RichardsComponentTransport_1D_Padilla_NaCl6
- PATH Parabolic/RichardsComponentTransport/Padilla/
+ PATH Parabolic/RichardsComponentTransport/Padilla
EXECUTABLE ogs
EXECUTABLE_ARGS Padilla_NaCl6.prj
WRAPPER time
--
GitLab