aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-10-08 07:59:14 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2016-10-08 08:06:59 -0400
commit3a002709f4d71d8de1bd3cc55cf022b94aeac44c (patch)
treefe5e963868828cf003c5b2fcecc578707314b0d2
parentb11a5b93cb4c50a1e5a4ced5473aafad791fa7c2 (diff)
downloadmeson-3a002709f4d71d8de1bd3cc55cf022b94aeac44c.zip
meson-3a002709f4d71d8de1bd3cc55cf022b94aeac44c.tar.gz
meson-3a002709f4d71d8de1bd3cc55cf022b94aeac44c.tar.bz2
Pass cmd line args onwards.
-rwxr-xr-xrun_tests.py2
-rwxr-xr-xrun_unittests.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/run_tests.py b/run_tests.py
index e8b0c8f..77e6754 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -31,5 +31,5 @@ if __name__ == '__main__':
myenv['CXX'] = 'clang++'
print("'\nRunnint unittests with clang.\n")
returncode += subprocess.call([sys.executable, 'run_unittests.py'], env=myenv)
- returncode += subprocess.call([sys.executable, 'run_project_tests.py'])
+ returncode += subprocess.call([sys.executable, 'run_project_tests.py'] + sys.argv[1:])
sys.exit(returncode)
diff --git a/run_unittests.py b/run_unittests.py
index dc07fc5..07d9250 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import unittest, os, shutil
+import unittest, os, sys, shutil
import subprocess
import re
@@ -32,7 +32,7 @@ class LinuxlikeTests(unittest.TestCase):
super().setUp()
src_root = os.path.split(__file__)[0]
self.builddir = 'unittestdir' # fixme to be unique
- self.meson_command = [os.path.join(src_root, 'meson.py')]
+ self.meson_command = [sys.executable, os.path.join(src_root, 'meson.py')]
self.ninja_command = ['ninja', '-C', self.builddir]
self.common_test_dir = os.path.join(src_root, 'test cases/common')
os.mkdir(self.builddir)