diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-01-27 23:26:48 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-01-28 01:05:21 +0530 |
| commit | 2e3091244727f9b2450fcb074992a82bd5a534f1 (patch) | |
| tree | fd7c8dd383a6d42a9a937fcd7adccd25566f4675 /mesontest.py | |
| parent | fc4e3326012aceeb3a1ef4a616e42e9cdfeadb9f (diff) | |
| download | meson-2e3091244727f9b2450fcb074992a82bd5a534f1.zip meson-2e3091244727f9b2450fcb074992a82bd5a534f1.tar.gz meson-2e3091244727f9b2450fcb074992a82bd5a534f1.tar.bz2 | |
vs: Fix running of tests to use mesontest.py
Back in November when this broke, we didn't notice because our tests
are run in-process, so we don't check that `msbuild RUN_TESTS.vcxproj`
and `ninja test` actually work.
Now we do.
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesontest.py b/mesontest.py index 1a0c9b1..2d99eee 100755 --- a/mesontest.py +++ b/mesontest.py @@ -160,9 +160,9 @@ class TestHarness: self.tests = None self.suites = None if self.options.benchmark: - self.load_datafile(os.path.join(options.wd, 'meson-private/meson_benchmark_setup.dat')) + self.load_datafile(os.path.join(options.wd, 'meson-private', 'meson_benchmark_setup.dat')) else: - self.load_datafile(os.path.join(options.wd, 'meson-private/meson_test_setup.dat')) + self.load_datafile(os.path.join(options.wd, 'meson-private', 'meson_test_setup.dat')) def rebuild_all(self): if not os.path.isfile(os.path.join(self.options.wd, 'build.ninja')): |