From 8b1039fa30a405e2d07ac70eb0284ee4654c619a Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Fri, 15 Jan 2016 21:12:23 +0200 Subject: Organise files into a module structure. --- run_tests.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index f1ed1c7..f1ea2a9 100755 --- a/run_tests.py +++ b/run_tests.py @@ -18,15 +18,15 @@ from glob import glob import os, subprocess, shutil, sys, signal from io import StringIO import sys -import environment -import mesonlib -import mlog -import meson, meson_test, meson_benchmark +from meson import environment +from meson import mesonlib +from meson import mlog +from meson import meson, meson_test, meson_benchmark import argparse import xml.etree.ElementTree as ET import time -from meson import backendlist +from meson.meson import backendlist class TestResult: def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0): -- cgit v1.1 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 f1ea2a9..e24c906 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.1 From 4c31e7774d09fe1a59b6cfd692de4f4cade1899c Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 16 Jan 2016 00:04:57 +0200 Subject: Finalize moduleification so that full test suite runs. --- run_tests.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index e24c906..bf56ea8 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 -- cgit v1.1 From 23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 16 Jan 2016 17:35:29 +0200 Subject: Renamed meson package to mesonbuild so that we can have a script named meson in the same toplevel dir. --- run_tests.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'run_tests.py') diff --git a/run_tests.py b/run_tests.py index bf56ea8..2211949 100755 --- a/run_tests.py +++ b/run_tests.py @@ -18,16 +18,16 @@ from glob import glob import os, subprocess, shutil, sys, signal from io import StringIO import sys -from meson import environment -from meson import mesonlib -from meson import mlog -from meson import mesonmain -from meson.scripts import meson_test, meson_benchmark +from mesonbuild import environment +from mesonbuild import mesonlib +from mesonbuild import mlog +from mesonbuild import mesonmain +from mesonbuild.scripts import meson_test, meson_benchmark import argparse import xml.etree.ElementTree as ET import time -from meson.mesonmain import backendlist +from mesonbuild.mesonmain import backendlist class TestResult: def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0): @@ -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 = os.path.join(os.getcwd(), 'meson.py') +meson_command = os.path.join(os.getcwd(), 'meson') class StopException(Exception): def __init__(self): -- cgit v1.1