Skip to content

Commit 571e73c

Browse files
jonahm-LANLjonahm-LANL
committed
fix tests to not call python explicitly and instead call the currently running interpreter
1 parent 177b0ac commit 571e73c

26 files changed

+26
-26
lines changed

‎test/advection1d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
# COMPILE CODE AT MULTIPLE RESOLUTIONS USING SEPARATE BUILD FILE
5050
for n,res in enumerate(RES):
5151
util.change_cparm('N{}TOT'.format(IDIM), res, TMP_BUILD)
52-
call(['python', TMP_BUILD, '-dir', TMP_DIR, '-idim', str(IDIM)])
52+
call([sys.executable, TMP_BUILD, '-dir', TMP_DIR, '-idim', str(IDIM)])
5353
call(['cp', os.path.join(os.getcwd(), TMP_DIR, 'bhlight'),
5454
'../../test/' + TMP_DIR + '/bhlight_' + str(res)])
5555
copyfile(os.path.join(os.getcwd(), TMP_DIR, 'param_template.dat'), '../../test/' +

‎test/advection2d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def phi_true(t,x,y):
7171
if MPI:
7272
for d in [1,2]:
7373
util.change_cparm('N{}CPU'.format(d), 2, TMP_BUILD)
74-
call(['python', TMP_BUILD, '-dir', TMP_DIR])
74+
call([sys.executable, TMP_BUILD, '-dir', TMP_DIR])
7575
parm_src = os.path.join(os.getcwd(), TMP_DIR, 'param_template.dat')
7676
parm_dest = '../../test/' + TMP_DIR + '/param.dat'
7777
call(['cp', os.path.join(os.getcwd(), TMP_DIR, 'bhlight'),

‎test/advection3d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def phi_true(t,x,y,z):
7474
if MPI:
7575
for d in [1,2,3]:
7676
util.change_cparm('N{}CPU'.format(d), 2, TMP_BUILD)
77-
call(['python', TMP_BUILD, '-dir', TMP_DIR])
77+
call([sys.executable, TMP_BUILD, '-dir', TMP_DIR])
7878
parm_src = os.path.join(os.getcwd(), TMP_DIR, 'param_template.dat')
7979
parm_dest = '../../test/' + TMP_DIR + '/param.dat'
8080
call(['cp', os.path.join(os.getcwd(), TMP_DIR, 'bhlight'),

‎test/binning.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
os.chdir('../prob/' + PROBLEM)
3333

3434
# COMPILE CODE
35-
args = ['python', 'build.py', '-dir', TMP_DIR, '-idim', str(IDIM)]
35+
args = [sys.executable, 'build.py', '-dir', TMP_DIR, '-idim', str(IDIM)]
3636
if MPI:
3737
args += ['-mpi']
3838
call(args)

‎test/bondi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
for n in xrange(len(RES)):
4242
util.change_cparm('N1TOT', RES[n], TMP_BUILD)
4343
util.change_cparm('N2TOT', RES[n], TMP_BUILD)
44-
call(['python', TMP_BUILD, '-dir', TMP_DIR])
44+
call([sys.executable, TMP_BUILD, '-dir', TMP_DIR])
4545
call(['cp', os.path.join(os.getcwd(), TMP_DIR, 'bhlight'),
4646
'../../test/' + TMP_DIR + '/bhlight_' + str(RES[n])])
4747
copyfile(os.path.join(os.getcwd(), TMP_DIR, 'param_template.dat'), '../../test/' +

‎test/brem.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
os.chdir('../prob/' + PROBLEM)
3636

3737
# COMPILE CODE
38-
call(['python', 'build.py', '-dir', TMP_DIR])
38+
call([sys.executable, 'build.py', '-dir', TMP_DIR])
3939
os.chdir('../../test')
4040
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
4141

‎test/brem_mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
os.chdir('../prob/' + PROBLEM)
2929

3030
# COMPILE CODE
31-
call(['python', 'build_mpi.py', '-dir', TMP_DIR])
31+
call([sys.executable, 'build_mpi.py', '-dir', TMP_DIR])
3232
os.chdir('../../test/')
3333
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
3434

‎test/comptonization.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
os.chdir('../prob/' + PROBLEM)
3232

3333
# COMPILE CODE
34-
call(['python', 'build.py', '-dir', TMP_DIR])
34+
call([sys.executable, 'build.py', '-dir', TMP_DIR])
3535
os.chdir('../../test')
3636
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
3737

‎test/entropy.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
os.chdir('../prob/' + PROBLEM)
3030

3131
# COMPILE CODE
32-
call(['python', 'build.py', '-dir', TMP_DIR])
32+
call([sys.executable, 'build.py', '-dir', TMP_DIR])
3333
os.chdir('../../test')
3434
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
3535

‎test/fornax.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
os.chdir('../prob/' + PROBLEM)
4242

4343
# COMPILE CODE
44-
compile_args = ['python','build.py','-dir',TMP_DIR]
44+
compile_args = [sys.executable,'build.py','-dir',TMP_DIR]
4545
if MPI:
4646
compile_args += ['-mpi']
4747
if EQUIL:

‎test/generate_all_plots.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
for TEST in TESTS:
5050
print ' ' + util.color.BOLD + TEST + util.color.NORMAL
51-
args = ['python', TEST]
51+
args = [sys.executable, TEST]
5252
if TABLE:
5353
args += ['-table']
5454
popen = sp.Popen(args, stdout=sp.PIPE, stderr=sp.PIPE,

‎test/leptoneq.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
os.chdir('../prob/' + PROBLEM)
3939

4040
# COMPILE CODE
41-
compile_args = ['python','build.py','-dir',TMP_DIR]
41+
compile_args = [sys.executable,'build.py','-dir',TMP_DIR]
4242
if MPI:
4343
compile_args += ['-mpi']
4444
call(compile_args)

‎test/mhdmodes1d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
for n in range(len(RES)):
4141
util.change_cparm('N{}TOT'.format(IDIM), RES[n], TMP_BUILD)
4242
#util.change_cparm('RECONSTRUCTION', 'PARA', TMP_BUILD)
43-
args = ['python', TMP_BUILD, '-dir', TMP_DIR, '-idim', str(IDIM)]
43+
args = [sys.executable, TMP_BUILD, '-dir', TMP_DIR, '-idim', str(IDIM)]
4444
if TABLE:
4545
args += ['-table']
4646
call(args)

‎test/mhdmodes2d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
for n in range(len(RES)):
4545
util.change_cparm('N1TOT', RES[n], TMP_BUILD)
4646
util.change_cparm('N2TOT', RES[n], TMP_BUILD)
47-
args = ['python', TMP_BUILD, '-dir', TMP_DIR]
47+
args = [sys.executable, TMP_BUILD, '-dir', TMP_DIR]
4848
if TABLE:
4949
args.append('-table')
5050
call(args)

‎test/mhdmodes2d_mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
for n in range(len(RES)):
4242
util.change_cparm('N1TOT', RES[n], TMP_BUILD)
4343
util.change_cparm('N2TOT', RES[n], TMP_BUILD)
44-
call(['python', TMP_BUILD, '-dir', TMP_DIR])
44+
call([sys.executable, TMP_BUILD, '-dir', TMP_DIR])
4545
call(['cp', os.path.join(os.getcwd(), TMP_DIR, 'bhlight'),
4646
'../../test/' + TMP_DIR + '/bhlight_' + str(RES[n])])
4747
copyfile(os.path.join(os.getcwd(), TMP_DIR, 'param_template.dat'), '../../test/' +

‎test/mhdmodes3d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
util.change_cparm('N2CPU', nxcpu, TMP_BUILD)
5555
util.change_cparm('N3CPU', nxcpu, TMP_BUILD)
5656
util.change_cparm('OPENMP', 'True', TMP_BUILD)
57-
args = ['python', TMP_BUILD, '-dir', TMP_DIR]
57+
args = [sys.executable, TMP_BUILD, '-dir', TMP_DIR]
5858
if TABLE:
5959
args.append('-table')
6060
call(args)

‎test/multiscatt.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
os.chdir('../prob/' + PROBLEM)
3838

3939
# COMPILE CODE
40-
args = ['python', 'build.py', '-dir', TMP_DIR]
40+
args = [sys.executable, 'build.py', '-dir', TMP_DIR]
4141
if MPI:
4242
args += ['-mpi']
4343
if NOREBALANCE:

‎test/sod.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
os.chdir('../prob/' + PROBLEM)
3737

3838
# COMPILE CODE
39-
args = ['python', 'build.py', '-dir', TMP_DIR]
39+
args = [sys.executable, 'build.py', '-dir', TMP_DIR]
4040
if TABLE:
4141
args.append('-table')
4242
if FORCE:

‎test/sod_mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
os.chdir('../prob/' + PROBLEM)
2828

2929
# COMPILE CODE
30-
call(['python', 'build.py', '-mpi', '-dir', TMP_DIR])
30+
call([sys.executable, 'build.py', '-mpi', '-dir', TMP_DIR])
3131
os.chdir('../../test/')
3232
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
3333

‎test/table.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
os.chdir('../prob/' + PROBLEM)
2626
# COMPILE CODE
27-
args = ['python', 'build.py', '-dir', TMP_DIR]
27+
args = [sys.executable, 'build.py', '-dir', TMP_DIR]
2828
call(args)
2929
call(['mv', 'sc_eos_gamma_{}.h5'.format(str(gam).replace('.','p')), TMP_DIR])
3030
os.chdir('../../test/')

‎test/test_all.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def L1_norm(xa, ya, xb, yb):
148148
args = name_to_args(TEST)
149149
TESTNAME = args[0][:-3] if len(args) == 1 else TEST
150150
print(' ' + util.color.BOLD + TESTNAME + util.color.NORMAL)
151-
args = ['python'] + args + ['-auto']
151+
args = [sys.executable] + args + ['-auto']
152152
if TABLE:
153153
args += ['-table']
154154
if FAST:

‎test/thermalization.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
os.chdir('../prob/' + PROBLEM)
3232

3333
# COMPILE CODE
34-
call(['python', 'build.py', '-dir', TMP_DIR])
34+
call([sys.executable, 'build.py', '-dir', TMP_DIR])
3535
os.chdir('../../test')
3636
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])
3737

‎test/thermalization_mpi.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
os.chdir('../prob/' + 'thermalization')
4040

4141
# COMPILE CODE
42-
call(['python', 'build_mpi.py', '-dir', TMP_DIR])
42+
call([sys.executable, 'build_mpi.py', '-dir', TMP_DIR])
4343
os.chdir('../../test')
4444
call(['mv', '../prob/' + 'thermalization' + '/' + TMP_DIR, './'])
4545

‎test/tracers1d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
os.chdir('../prob/' + PROBLEM)
4040

4141
# COMPILE CODE
42-
call(['python', 'build.py', '-dir', TMP_DIR, '-idim',
42+
call([sys.executable, 'build.py', '-dir', TMP_DIR, '-idim',
4343
str(IDIM),'-ntot',str(RES),'-tracers'])
4444
os.chdir('../../test/')
4545
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])

‎test/tracers3d.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
os.chdir('../prob/' + PROBLEM)
3838

3939
# COMPILE CODE
40-
call(['python', 'build.py', '-dir', TMP_DIR,
40+
call([sys.executable, 'build.py', '-dir', TMP_DIR,
4141
'-classic', '-nob', '-norenorm', '-tracertest'])
4242
os.chdir('../../test/')
4343
call(['mv', '../prob/' + PROBLEM + '/' + TMP_DIR, './'])

‎test/yedecay.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
os.chdir('../prob/' + PROBLEM)
4141

4242
# COMPILE CODE
43-
compile_args = ['python','build.py','-dir',TMP_DIR]
43+
compile_args = [sys.executable,'build.py','-dir',TMP_DIR]
4444
if MPI:
4545
compile_args += ['-mpi']
4646
if ANTINU:

0 commit comments

Comments
 (0)