diff options
| author | Max Kellermann <max@musicpd.org> | 2020-02-04 16:49:18 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2020-02-04 16:49:18 +0100 |
| commit | 3fc859c42db85b763353bf7ae9346d4139f528d3 (patch) | |
| tree | a815796723debefd213b522639aaacc112d7e6f0 /test | |
| parent | 4b0444e760a3bcbaeb8cfd1f7964b00d9f0fe07a (diff) | |
| parent | f1ad21d2bf97b6ecb2359afccf389c65c2eb7d13 (diff) | |
Merge branch 'v0.21.x'
Diffstat (limited to 'test')
| -rw-r--r-- | test/DumpDecoderClient.cxx | 6 | ||||
| -rw-r--r-- | test/meson.build | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/test/DumpDecoderClient.cxx b/test/DumpDecoderClient.cxx index c71d27717..35c787b45 100644 --- a/test/DumpDecoderClient.cxx +++ b/test/DumpDecoderClient.cxx @@ -28,15 +28,15 @@ void DumpDecoderClient::Ready(const AudioFormat audio_format, - gcc_unused bool seekable, + bool seekable, SignedSongTime duration) noexcept { assert(!initialized); assert(audio_format.IsValid()); - fprintf(stderr, "audio_format=%s duration=%f\n", + fprintf(stderr, "audio_format=%s duration=%f seekable=%d\n", ToString(audio_format).c_str(), - duration.ToDoubleS()); + duration.ToDoubleS(), seekable); initialized = true; } diff --git a/test/meson.build b/test/meson.build index 7fcf4c822..71dacd67c 100644 --- a/test/meson.build +++ b/test/meson.build @@ -6,10 +6,14 @@ if compiler.get_id() == 'gcc' gtest_compile_args += [ '-Wno-suggest-attribute=format', '-Wno-suggest-attribute=noreturn', - '-Wno-missing-declarations', + ] +endif - # needed on Jessie for gtest's IsNullLiteralHelper - '-Wno-conversion-null', +if compiler.get_id() == 'clang' and compiler.version().version_compare('>=9') + gtest_compile_args += [ + # work around clang warning caused by GTest's wrong "-lpthread" + # compiler flag + '-Wno-unused-command-line-argument', ] endif |