@@ -18,10 +18,8 @@ import termios
import logging
logger = logging.getLogger()
-if os.path.exists('../../wpaspy'):
- sys.path.append('../../wpaspy')
-else:
- sys.path.append('../../../wpaspy')
+scriptsdir = os.path.dirname(os.path.realpath(sys.modules[__name__].__file__))
+sys.path.append(os.path.join(scriptsdir, '..', '..', 'wpaspy'))
from wpasupplicant import WpaSupplicant
from hostapd import HostapdGlobal
@@ -169,10 +167,7 @@ def rename_log(logdir, basename, testname, dev):
def main():
tests = []
test_modules = []
- if os.path.exists('run-tests.py'):
- files = os.listdir(".")
- else:
- files = os.listdir("..")
+ files = os.listdir(scriptsdir)
for t in files:
m = re.match(r'(test_.*)\.py$', t)
if m:
@@ -241,6 +241,7 @@ def show_progress(scr):
def main():
import argparse
+ import os
global num_servers
global vm
global dir
@@ -258,6 +259,8 @@ def main():
debug_level = logging.INFO
rerun_failures = True
+ scriptsdir = os.path.dirname(os.path.realpath(sys.argv[0]))
+
p = argparse.ArgumentParser(description='run multiple testing VMs in parallel')
p.add_argument('num_servers', metavar='number of VMs', type=int, choices=range(1, 100),
help="number of VMs to start")
@@ -279,7 +282,7 @@ def main():
print "Code coverage - build separate binaries"
logdir = "/tmp/hwsim-test-logs/" + str(timestamp)
os.makedirs(logdir)
- subprocess.check_call(['./build-codecov.sh', logdir])
+ subprocess.check_call([os.path.join(scriptsdir, 'build-codecov.sh'), logdir])
codecov_args = ['--codecov_dir', logdir]
codecov = True
else:
@@ -290,7 +293,8 @@ def main():
first_run_failures = []
tests = []
- cmd = [ '../run-tests.py', '-L' ] + args.params
+ cmd = [ os.path.join(os.path.dirname(scriptsdir), 'run-tests.py'), '-L' ] + args.params
+ print cmd
lst = subprocess.Popen(cmd, stdout=subprocess.PIPE)
for l in lst.stdout.readlines():
name = l.split(' ')[0]
@@ -369,7 +373,7 @@ def main():
for i in range(0, num_servers):
print("\rStarting virtual machine {}/{}".format(i + 1, num_servers)),
logger.info("Starting virtual machine {}/{}".format(i + 1, num_servers))
- cmd = ['./vm-run.sh', '--delay', str(i), '--timestamp', str(timestamp),
+ cmd = [os.path.join(scriptsdir, 'vm-run.sh'), '--delay', str(i), '--timestamp', str(timestamp),
'--ext', 'srv.%d' % (i + 1),
'-i'] + codecov_args + extra_args
vm[i] = {}
@@ -440,10 +444,10 @@ def main():
if codecov:
print "Code coverage - preparing report"
for i in range(num_servers):
- subprocess.check_call(['./process-codecov.sh',
+ subprocess.check_call([os.path.join(scriptsdir, 'process-codecov.sh'),
logdir + ".srv.%d" % (i + 1),
str(i)])
- subprocess.check_call(['./combine-codecov.sh', logdir])
+ subprocess.check_call([os.path.join(scriptsdir, 'combine-codecov.sh'), logdir])
print "file://%s/index.html" % logdir
logger.info("Code coverage report: file://%s/index.html" % logdir)