Skip to content

Commit 31cf15b

Browse files
lterraclterrac
committed
fix: use full_path() instead of path()
1 parent db2d534 commit 31cf15b

File tree

16 files changed

+47
-46
lines changed

16 files changed

+47
-46
lines changed

‎examples/abcTasks/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ])
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ])
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p')
15+
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p')
1616
endif
1717
endif
1818

‎examples/cholesky/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
1010
threading = executable('threading', [ 'source/pthreads.cpp'], include_directories: include_directories(['source']), dependencies: [ choleskyDep] )
1111

1212
if get_option('buildTests')
13-
test('threading', threading, args: [ '384', '24', '0', '0' ], suite: testSuite, workdir: threading.path() + '.p' )
13+
test('threading', threading, args: [ '384', '24', '0', '0' ], suite: testSuite, workdir: threading.full_path() + '.p' )
1414
endif
1515
endif
1616

1717
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1818
nosv = executable('nosv', [ 'source/nosv.cpp'], include_directories: include_directories(['source']), dependencies: [ choleskyDep] )
1919

2020
if get_option('buildTests')
21-
test('nosv', nosv, args: [ '384', '24', '0', '0' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
21+
test('nosv', nosv, args: [ '384', '24', '0', '0' ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
2222
endif
2323
endif

‎examples/conditionVariable/meson.build‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
77
threading_conditionVariableWaitForCondition = executable('threading_conditionVariableWaitForCondition', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ], cpp_args: [ '-D__TEST_FUNCTION_=conditionVariableWaitForCondition'] )
88

99
if get_option('buildTests')
10-
test('threading_conditionVariableWait', threading_conditionVariableWait, args : [ ], suite: testSuite, workdir: threading_conditionVariableWait.path() + '.p' )
11-
test('threading_conditionVariableWaitFor', threading_conditionVariableWaitFor, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitFor.path() + '.p' )
12-
test('threading_conditionVariableWaitCondition', threading_conditionVariableWaitCondition, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitCondition.path() + '.p' )
13-
test('threading_conditionVariableWaitForCondition', threading_conditionVariableWaitForCondition, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitForCondition.path() + '.p' )
10+
test('threading_conditionVariableWait', threading_conditionVariableWait, args : [ ], suite: testSuite, workdir: threading_conditionVariableWait.full_path() + '.p' )
11+
test('threading_conditionVariableWaitFor', threading_conditionVariableWaitFor, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitFor.full_path() + '.p' )
12+
test('threading_conditionVariableWaitCondition', threading_conditionVariableWaitCondition, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitCondition.full_path() + '.p' )
13+
test('threading_conditionVariableWaitForCondition', threading_conditionVariableWaitForCondition, args : [ ], suite: testSuite, workdir: threading_conditionVariableWaitForCondition.full_path() + '.p' )
1414
endif
1515
endif
1616

@@ -21,10 +21,10 @@ if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processi
2121
nosv_conditionVariableWaitForCondition = executable('nosv_conditionVariableWaitForCondition', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ], cpp_args: [ '-D__TEST_FUNCTION_=conditionVariableWaitForCondition'] )
2222

2323
if get_option('buildTests')
24-
test('nosv_conditionVariableWait', nosv_conditionVariableWait, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWait.path() + '.p' )
25-
test('nosv_conditionVariableWaitFor', nosv_conditionVariableWaitFor, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitFor.path() + '.p' )
26-
test('nosv_conditionVariableWaitCondition', nosv_conditionVariableWaitCondition, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitCondition.path() + '.p' )
27-
test('nosv_conditionVariableWaitForCondition', nosv_conditionVariableWaitForCondition, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitForCondition.path() + '.p' )
24+
test('nosv_conditionVariableWait', nosv_conditionVariableWait, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWait.full_path() + '.p' )
25+
test('nosv_conditionVariableWaitFor', nosv_conditionVariableWaitFor, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitFor.full_path() + '.p' )
26+
test('nosv_conditionVariableWaitCondition', nosv_conditionVariableWaitCondition, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitCondition.full_path() + '.p' )
27+
test('nosv_conditionVariableWaitForCondition', nosv_conditionVariableWaitForCondition, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv_conditionVariableWaitForCondition.full_path() + '.p' )
2828
endif
2929
endif
3030

‎examples/energySaver/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ])
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ '3', '1', '100' ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ '3', '1', '100' ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ])
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ '3', '1', '100' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ '3', '1', '100' ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

‎examples/fibonacci/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ])
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ '15' ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ '15' ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ])
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ '15' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ '15' ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

‎examples/jacobi3d/meson.build‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,47 @@
11
testSuite = [ 'examples', 'jacobi3d' ]
22

3-
if distributedEngine == 'mpi'
3+
if 'mpi' in distributedEngines
44
TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_MPI'
55

66
mpirunExecutable = HiCRProject.get_variable('mpirunExecutable')
77

88
if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
9-
threading = executable('threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
9+
threading = executable('mpi-threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
1010

1111
if get_option('buildTests')
12-
test('threading', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite, workdir: threading.path() + '.p' )
12+
test('mpi-threading', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite + ['mpi'], workdir: threading.full_path() + '.p' )
1313
endif
1414
endif
1515

1616
# TODO: deadlocking (even for mpirun -n 1)
1717
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
18-
nosv = executable('nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
18+
nosv = executable('mpi-nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
1919

2020
if get_option('buildTests')
21-
test('nosv', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
21+
test('mpi-nosv', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite + ['mpi'], workdir: nosv.full_path() + '.p' )
2222
endif
2323
endif
24+
endif
2425

25-
elif distributedEngine == 'lpf'
26+
if 'lpf' in distributedEngines
2627
TaskRDistributedCppFlag = '-D_TASKR_DISTRIBUTED_ENGINE_LPF'
2728

2829
mpirunExecutable = find_program('mpirun', '/usr/bin/mpirun', '/usr/local/bin/mpirun', required : true)
2930

3031
if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('processingUnitType')
31-
threading = executable('threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
32+
threading = executable('lpf-threading', [ 'source/pthreads.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
3233

3334
if get_option('buildTests')
34-
test('threading', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', 'env', 'LPF_ENGINE=zero', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite, workdir: threading.path() + '.p' )
35+
test('lpf-threading', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', 'env', 'LPF_ENGINE=zero', threading.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], suite: testSuite + ['lpf'], workdir: threading.full_path() + '.p' )
3536
endif
3637
endif
3738

3839

3940
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
40-
nosv = executable('nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
41+
nosv = executable('lpf-nosv', [ 'source/nosv.cpp', 'source/grid.cpp' ], dependencies: [ TaskRBuildDep ], cpp_args: [ TaskRDistributedCppFlag ] )
4142

4243
if get_option('buildTests')
43-
test('nosv', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', 'env', 'LPF_ENGINE=zero', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
44+
test('lpf-nosv', mpirunExecutable, args : [ '-n', '2', '--oversubscribe', 'env', 'LPF_ENGINE=zero', nosv.full_path(), '-px', '1', '-py', '1', '-pz', '2', '-lx', '1', '-ly', '2', '-lz', '2', '-n', '64', '-i', '10'], is_parallel : false, suite: testSuite + ['lpf'], workdir: nosv.full_path() + '.p' )
4445
endif
4546
endif
4647
endif

‎examples/manyParallel/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ] )
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ '2', '100' ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ '2', '100' ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ] )
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ '2', '100' ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ '2', '100' ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

‎examples/multiJob/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp', 'cpp/job1.cpp', 'cpp/job2.cpp' ], dependencies: [ TaskRBuildDep ] )
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp', 'cpp/job1.cpp', 'cpp/job2.cpp' ], dependencies: [ TaskRBuildDep ] )
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

‎examples/mutex/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ] )
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ] )
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

‎examples/pendingOperation/meson.build‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ if 'boost' in get_option('executionStateType') and 'pthreads' in get_option('pro
44
threading = executable('threading', [ 'cpp/pthreads.cpp'], dependencies: [ TaskRBuildDep ] )
55

66
if get_option('buildTests')
7-
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.path() + '.p' )
7+
test('threading', threading, args : [ ], suite: testSuite, workdir: threading.full_path() + '.p' )
88
endif
99
endif
1010

1111
if 'nosv' in get_option('executionStateType') and 'nosv' in get_option('processingUnitType')
1212
nosv = executable('nosv', [ 'cpp/nosv.cpp'], dependencies: [ TaskRBuildDep ] )
1313

1414
if get_option('buildTests')
15-
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.path() + '.p' )
15+
test('nosv', nosv, args : [ ], is_parallel : false, suite: testSuite, workdir: nosv.full_path() + '.p' )
1616
endif
1717
endif
1818

0 commit comments

Comments
 (0)