|
@@ -110,6 +110,7 @@ def run_file(files, parameters, expected, mode):
|
|
|
proc = execute("run_local_modelverse", [str(port)], wait=False)
|
|
|
|
|
|
threads = []
|
|
|
+ mod_files = []
|
|
|
for filename in files:
|
|
|
if os.path.isfile("integration/code/%s" % filename):
|
|
|
mod_filename = "integration/code/%s" % filename
|
|
@@ -121,10 +122,11 @@ def run_file(files, parameters, expected, mode):
|
|
|
|
|
|
if parallel_push:
|
|
|
import threading
|
|
|
- threads.append(threading.Thread(target=compile_file, args=[address, mod_filename, filename, mode, proc]))
|
|
|
+ threads.append(threading.Thread(target=compile_file, args=[address, mod_filename, mod_filename, mode, proc]))
|
|
|
threads[-1].start()
|
|
|
else:
|
|
|
- compile_file(address, mod_filename, filename, mode, proc)
|
|
|
+ compile_file(address, mod_filename, mod_filename, mode, proc)
|
|
|
+ mod_files.append(mod_filename)
|
|
|
|
|
|
if parallel_push:
|
|
|
for t in threads:
|
|
@@ -132,7 +134,7 @@ def run_file(files, parameters, expected, mode):
|
|
|
|
|
|
if mode[-1] == "O":
|
|
|
# Fire up the linker
|
|
|
- val = execute("link_and_load", [address, username] + files, wait=True)
|
|
|
+ val = execute("link_and_load", [address, username] + mod_files, wait=True)
|
|
|
if val != 0:
|
|
|
raise Exception("Linking error")
|
|
|
|