From a5508d3fd362ea33633d9706a6257ef0f0c2bbc0 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 15 Jan 2016 21:43:15 +0200 Subject: Can run most of test suite (with hacks). --- run_tests.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index f1ea2a909..e24c906f3 100755 --- a/run_tests.py +++ b/run_tests.py @@ -21,12 +21,13 @@ import sys from meson import environment from meson import mesonlib from meson import mlog -from meson import meson, meson_test, meson_benchmark +from meson import mesonmain +from scripts import meson_test, meson_benchmark import argparse import xml.etree.ElementTree as ET import time -from meson.meson import backendlist +from meson.mesonmain import backendlist class TestResult: def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0): @@ -154,7 +155,7 @@ def run_configure_inprocess(commandlist): old_stderr = sys.stderr sys.stderr = mystderr = StringIO() try: - returncode = meson.run(commandlist) + returncode = mesonmain.run(commandlist) finally: sys.stdout = old_stdout sys.stderr = old_stderr -- cgit v1.2.3