@@ -407,13 +407,12 @@ def graalpython_gate_runner(args, tasks):
407407 if task :
408408 svm_image_name = "./graalpython-svm"
409409 if not os .path .exists (svm_image_name ):
410- python_svm (["-h" ])
411- else :
412- llvm_home = mx_subst .path_substitutions .substitute ('--native.Dllvm.home=<path:SULONG_LIBS>' )
413- args = ["--python.CoreHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-graalpython" ),
414- "--python.StdLibHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-python/3" ),
415- llvm_home ]
416- run_python_unittests (svm_image_name , args )
410+ svm_image_name = python_svm (["-h" ])
411+ llvm_home = mx_subst .path_substitutions .substitute ('--native.Dllvm.home=<path:SULONG_LIBS>' )
412+ args = ["--python.CoreHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-graalpython" ),
413+ "--python.StdLibHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-python/3" ),
414+ llvm_home ]
415+ run_python_unittests (svm_image_name , args )
417416
418417 with Task ('GraalPython apptests' , tasks , tags = [GraalPythonTags .apptests ]) as task :
419418 if task :
@@ -448,6 +447,11 @@ def graalpython_gate_runner(args, tasks):
448447 ])
449448 if success not in out .data :
450449 mx .abort ('Output from generated SVM image "' + svm_image + '" did not match success pattern:\n ' + success )
450+ llvm_home = mx_subst .path_substitutions .substitute ('--native.Dllvm.home=<path:SULONG_LIBS>' )
451+ args = ["--python.CoreHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-graalpython" ),
452+ "--python.StdLibHome=%s" % os .path .join (_suite .dir , "graalpython" , "lib-python/3" ),
453+ llvm_home ]
454+ run_python_unittests (svm_image , args )
451455
452456
453457mx_gate .add_gate_runner (_suite , graalpython_gate_runner )
0 commit comments