diff options
| author | Marvin Scholz <epirat07@gmail.com> | 2019-07-15 12:12:49 +0200 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2019-11-07 17:50:00 +0530 |
| commit | 273d6e75eafb8cdae746bd418f8dd27f688a76e9 (patch) | |
| tree | 75175caf866da416ff7602bf52f252ac5cb5ccd8 /run_unittests.py | |
| parent | fc86339b39cfb13f084b943597cd4ee14b58f9d8 (diff) | |
| download | meson-273d6e75eafb8cdae746bd418f8dd27f688a76e9.zip meson-273d6e75eafb8cdae746bd418f8dd27f688a76e9.tar.gz meson-273d6e75eafb8cdae746bd418f8dd27f688a76e9.tar.bz2 | |
dependencies/pkgconfig: Fix error reporting
The stderr of pkg-config was never used, leading to no details about
failures at all in exception messages.
Diffstat (limited to 'run_unittests.py')
| -rwxr-xr-x | run_unittests.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py index e444a40..7d0b624 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -860,13 +860,13 @@ class InternalTests(unittest.TestCase): def fake_call_pkgbin(self, args, env=None): if '--libs' not in args: - return 0, '' + return 0, '', '' if args[0] == 'foo': - return 0, '-L{} -lfoo -L{} -lbar'.format(p2.as_posix(), p1.as_posix()) + return 0, '-L{} -lfoo -L{} -lbar'.format(p2.as_posix(), p1.as_posix()), '' if args[0] == 'bar': - return 0, '-L{} -lbar'.format(p2.as_posix()) + return 0, '-L{} -lbar'.format(p2.as_posix()), '' if args[0] == 'internal': - return 0, '-L{} -lpthread -lm -lc -lrt -ldl'.format(p1.as_posix()) + return 0, '-L{} -lpthread -lm -lc -lrt -ldl'.format(p1.as_posix()), '' old_call = PkgConfigDependency._call_pkgbin old_check = PkgConfigDependency.check_pkgconfig |