aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-01-16 17:35:29 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-01-16 17:35:29 +0200
commit23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585 (patch)
treee349597556abe3d22578cfb1f9529f4626ceb5aa /run_tests.py
parent1510522b1b9970376a1e1cc5f39e00d8749ec19a (diff)
downloadmeson-23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585.zip
meson-23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585.tar.gz
meson-23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585.tar.bz2
Renamed meson package to mesonbuild so that we can have a script named meson in the same toplevel dir.
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py14
1 files changed, 7 insertions, 7 deletions
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):