diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-28 19:05:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-28 19:05:54 +0200 |
| commit | 4a08841331cf0bb281ff5fa37ac106b539423140 (patch) | |
| tree | b9f14dbee8c924d8910af2b8607dee438f6ee779 /mesontest.py | |
| parent | 6357ad0cd051d56deeb6c029a436b47b1f5216ae (diff) | |
| parent | 534ee8baa8b807b2adf52937a4672897f1a6d8cb (diff) | |
| download | meson-4a08841331cf0bb281ff5fa37ac106b539423140.zip meson-4a08841331cf0bb281ff5fa37ac106b539423140.tar.gz meson-4a08841331cf0bb281ff5fa37ac106b539423140.tar.bz2 | |
Merge pull request #1335 from tp-m/test-custom-target-used-in-test-cmd
tests: check custom target output is created before being used in a t…
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 7d443c7..f5da103 100755 --- a/mesontest.py +++ b/mesontest.py @@ -162,9 +162,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')): |