Skip to content

Commit 2c65371

Browse files
committed
[install] modify and regenerate the acceptance tests after fixing both PYTHONPATH and the ./bin/mg5_aMC command line arguments
PS: this finally succeeds in the CI while using a plugin in ../MG5aMC_PLUGIN, all bugs have been fixed - some cleanup is still possible (NB it is possible to test this interactively as "./tests/test_manager.py -p./cudacpp_acceptance_tests/ test_simd_cpp_eemumua_float")
1 parent 465a0a5 commit 2c65371

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/create_acceptance_from_file.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ def test_%(name)s(self):
3737
3838
open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd)
3939
newenv = os.environ.copy()
40-
newenv[\"PYTHONPATH\"] = f\"..\"
41-
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC','-m','CUDACPP_OUTPUT'),
40+
newenv[\"PYTHONPATH\"] = pjoin(MG5DIR, '..')
41+
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'),'-m','CUDACPP_OUTPUT',
4242
pjoin(self.path, 'mg5_cmd')], env=newenv,
4343
#cwd=self.path,
4444
stdout=stdout, stderr=stderr)

epochX/cudacpp/CODEGEN/PLUGIN/CUDACPP_SA_OUTPUT/acceptance_tests/test_simd_madevent.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,8 @@ def test_simd_cpp_eemumua_float(self):
149149

150150
open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd)
151151
newenv = os.environ.copy()
152-
newenv["PYTHONPATH"] = f".."
153-
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC','-m','CUDACPP_OUTPUT'),
152+
newenv["PYTHONPATH"] = pjoin(MG5DIR, '..')
153+
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'),'-m','CUDACPP_OUTPUT',
154154
pjoin(self.path, 'mg5_cmd')], env=newenv,
155155
#cwd=self.path,
156156
stdout=stdout, stderr=stderr)
@@ -199,8 +199,8 @@ def test_simd_cpp_heft_ggh_double(self):
199199

200200
open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd)
201201
newenv = os.environ.copy()
202-
newenv["PYTHONPATH"] = f".."
203-
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC','-m','CUDACPP_OUTPUT'),
202+
newenv["PYTHONPATH"] = pjoin(MG5DIR, '..')
203+
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'),'-m','CUDACPP_OUTPUT',
204204
pjoin(self.path, 'mg5_cmd')], env=newenv,
205205
#cwd=self.path,
206206
stdout=stdout, stderr=stderr)
@@ -249,8 +249,8 @@ def test_simd_cpp_pptt_mixed(self):
249249

250250
open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd)
251251
newenv = os.environ.copy()
252-
newenv["PYTHONPATH"] = f".."
253-
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC','-m','CUDACPP_OUTPUT'),
252+
newenv["PYTHONPATH"] = pjoin(MG5DIR, '..')
253+
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'),'-m','CUDACPP_OUTPUT',
254254
pjoin(self.path, 'mg5_cmd')], env=newenv,
255255
#cwd=self.path,
256256
stdout=stdout, stderr=stderr)
@@ -306,8 +306,8 @@ def test_simd_cpp_vector_size(self):
306306

307307
open(pjoin(self.path, 'mg5_cmd'),'w').write(cmd)
308308
newenv = os.environ.copy()
309-
newenv["PYTHONPATH"] = f".."
310-
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC','-m','CUDACPP_OUTPUT'),
309+
newenv["PYTHONPATH"] = pjoin(MG5DIR, '..')
310+
subprocess.call([sys.executable, pjoin(MG5DIR, 'bin','mg5_aMC'),'-m','CUDACPP_OUTPUT',
311311
pjoin(self.path, 'mg5_cmd')], env=newenv,
312312
#cwd=self.path,
313313
stdout=stdout, stderr=stderr)

0 commit comments

Comments
 (0)