Finalize moduleification so that full test suite runs.

1 files changed, 4 insertions, 4 deletions

diff --git a/run_tests.py b/run_tests.py
index e24c906f3..bf56ea86d 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2012-2015 The Meson development team
+# Copyright 2012-2016 The Meson development team
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@ from meson import environment
 from meson import mesonlib
 from meson import mlog
 from meson import mesonmain
-from scripts import meson_test, meson_benchmark
+from meson.scripts import meson_test, meson_benchmark
 import argparse
 import xml.etree.ElementTree as ET
 import time
@@ -45,7 +45,7 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ
 
 test_build_dir = 'work area'
 install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
-meson_command = './meson.py'
+meson_command = os.path.join(os.getcwd(), 'meson.py')
 
 class StopException(Exception):
     def __init__(self):
@@ -155,7 +155,7 @@ def run_configure_inprocess(commandlist):
     old_stderr = sys.stderr
     sys.stderr = mystderr = StringIO()
     try:
-        returncode = mesonmain.run(commandlist)
+        returncode = mesonmain.run(commandlist[0], commandlist[1:])
     finally:
         sys.stdout = old_stdout
         sys.stderr = old_stderr