diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2013-01-06 19:17:38 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2013-01-06 19:17:38 +0200 |
| commit | 36e2b0cd37df8d360c057222c5eb511751b67807 (patch) | |
| tree | 7c7d9f3b77b8e87e5c122c089f89e820c0f87311 | |
| parent | 54e47554c36870a43061c0860e5a69494c18cc02 (diff) | |
| download | meson-36e2b0cd37df8d360c057222c5eb511751b67807.zip meson-36e2b0cd37df8d360c057222c5eb511751b67807.tar.gz meson-36e2b0cd37df8d360c057222c5eb511751b67807.tar.bz2 | |
Run generated tests as part of overall testing.
| -rwxr-xr-x | run_tests.py | 5 | ||||
| -rw-r--r-- | test cases/2 cxx/builder.txt | 1 | ||||
| -rw-r--r-- | test cases/5 linkstatic/builder.txt | 1 | ||||
| -rw-r--r-- | test cases/6 linkshared/builder.txt | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/run_tests.py b/run_tests.py index afaa7e6..45d61d4 100755 --- a/run_tests.py +++ b/run_tests.py @@ -20,6 +20,7 @@ import os, subprocess, shutil test_build_dir = 'work area' builder_command = './builder.py' compile_command = os.path.join(test_build_dir, 'compile.sh') +test_command = os.path.join(test_build_dir, 'run_tests.sh') def run_test(testdir): shutil.rmtree(test_build_dir) @@ -33,6 +34,10 @@ def run_test(testdir): pc.wait() if pc.returncode != 0: raise RuntimeError('Compiling source code failed.') + pt = subprocess.Popen([test_command]) + pt.wait() + if pt.returncode != 0: + raise RuntimeError('Running unit tests failed.') def run_tests(): tests = glob('test cases/*') diff --git a/test cases/2 cxx/builder.txt b/test cases/2 cxx/builder.txt index 724d0e3..031bc9e 100644 --- a/test cases/2 cxx/builder.txt +++ b/test cases/2 cxx/builder.txt @@ -1,3 +1,4 @@ project('c++ test') language('c++') exe = executable('trivialprog', 'trivial.cc') +add_test('runtest', exe) diff --git a/test cases/5 linkstatic/builder.txt b/test cases/5 linkstatic/builder.txt index 5e98a25..1b61eee 100644 --- a/test cases/5 linkstatic/builder.txt +++ b/test cases/5 linkstatic/builder.txt @@ -3,3 +3,4 @@ language('c') lib = static_library('mylib', 'libfile.c') exe = executable('prog', 'main.c') exe.link(lib) +add_test('runtest', exe) diff --git a/test cases/6 linkshared/builder.txt b/test cases/6 linkshared/builder.txt index fbbac85..6bec6d2 100644 --- a/test cases/6 linkshared/builder.txt +++ b/test cases/6 linkshared/builder.txt @@ -3,3 +3,4 @@ language('c') lib = shared_library('mylib', 'libfile.c') exe = executable('prog', 'main.c') exe.link(lib) +add_test('runtest', exe) |