Skip to content

Commit 9b7a3b5

Browse files
authored
Merge pull request #228 from kaipartmann/mpi-tests-project-dir
Make all MPI tests relocatable and remove relative path to Project.toml
2 parents d4f7936 + aedd262 commit 9b7a3b5

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

test/auxiliary/test_mpi.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ end
3737
"""
3838
mpiexec = Peridynamics.MPI.mpiexec()
3939
jlcmd = Base.julia_cmd()
40-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
40+
pdir = pkgdir(Peridynamics)
4141
cmd = `$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`
4242
@test success(cmd) # does not print anything
4343
# for debugging use the run command:

test/auxiliary/test_process_each_export.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
"""
7575
mpiexec = Peridynamics.MPI.mpiexec()
7676
jlcmd = Base.julia_cmd()
77-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
77+
pdir = pkgdir(Peridynamics)
7878
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
7979
file_1_mpi = joinpath(root_post_mpi, "max_displacement_1.txt")
8080
@test isfile(file_1_mpi)

test/core/test_halo_exchange.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ end
318318
"""
319319
mpiexec = Peridynamics.MPI.mpiexec()
320320
jlcmd = Base.julia_cmd()
321-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
321+
pdir = pkgdir(Peridynamics)
322322
cmd = `$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`
323323
@test success(cmd) # does not print anything
324324
# for debugging use the run command:
@@ -368,7 +368,7 @@ end
368368
"""
369369
mpiexec = Peridynamics.MPI.mpiexec()
370370
jlcmd = Base.julia_cmd()
371-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
371+
pdir = pkgdir(Peridynamics)
372372
cmd = `$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`
373373
@test success(cmd) # does not print anything
374374
# for debugging use the run command:

test/integration/mpi_threads_comparison.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"""
5050
mpiexec = Peridynamics.MPI.mpiexec()
5151
jlcmd = Base.julia_cmd()
52-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
52+
pdir = pkgdir(Peridynamics)
5353
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
5454

5555
@test isdir(path_threads_vtk)
@@ -117,7 +117,7 @@ end
117117
"""
118118
mpiexec = Peridynamics.MPI.mpiexec()
119119
jlcmd = Base.julia_cmd()
120-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
120+
pdir = pkgdir(Peridynamics)
121121
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
122122

123123
@test isdir(path_threads_vtk)
@@ -190,7 +190,7 @@ end
190190
"""
191191
mpiexec = Peridynamics.MPI.mpiexec()
192192
jlcmd = Base.julia_cmd()
193-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
193+
pdir = pkgdir(Peridynamics)
194194
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
195195

196196
@test isdir(path_threads_vtk)
@@ -258,7 +258,7 @@ end
258258
"""
259259
mpiexec = Peridynamics.MPI.mpiexec()
260260
jlcmd = Base.julia_cmd()
261-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
261+
pdir = pkgdir(Peridynamics)
262262
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
263263

264264
@test isdir(path_threads_vtk)
@@ -326,7 +326,7 @@ end
326326
"""
327327
mpiexec = Peridynamics.MPI.mpiexec()
328328
jlcmd = Base.julia_cmd()
329-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
329+
pdir = pkgdir(Peridynamics)
330330
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
331331

332332
@test isdir(path_threads_vtk)
@@ -395,7 +395,7 @@ end
395395
"""
396396
mpiexec = Peridynamics.MPI.mpiexec()
397397
jlcmd = Base.julia_cmd()
398-
pdir = normpath(joinpath(@__DIR__, "..", ".."))
398+
pdir = pkgdir(Peridynamics)
399399
run(`$(mpiexec) -n 2 $(jlcmd) --project=$(pdir) -e $(mpi_cmd)`)
400400

401401
@test isdir(path_threads_vtk)

0 commit comments

Comments
 (0)