From ff14efa446198c3eb07ba34bb4c4070b169bef30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 28 Nov 2020 09:47:07 +0100 Subject: [PATCH] AnyShaderConverter: adapt test to GlslangShaderConverter changes. Format::Spirv is now allowed output format for validation. --- .../AnyShaderConverter/Test/AnyConverterTest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp b/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp index 98a338c0d..799ba94b4 100644 --- a/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp +++ b/src/MagnumPlugins/AnyShaderConverter/Test/AnyConverterTest.cpp @@ -242,14 +242,14 @@ void AnyConverterTest::validatePropagateOutputVersion() { /* This is an invalid version. We have to supply a valid file path because the version gets checked in doValidateData(), called from AbstractConverter::doValidateFile() with the file contents. */ - converter->setOutputFormat(Format::Spirv, "opengl4.0"); + converter->setOutputFormat(Format::Glsl, "opengl4.0"); std::ostringstream out; Error redirectError{&out}; CORRADE_COMPARE(converter->validateFile(Stage::Fragment, Utility::Directory::join(ANYSHADERCONVERTER_TEST_DIR, "file.glsl")), std::make_pair(false, "")); CORRADE_COMPARE(out.str(), - "ShaderTools::GlslangConverter::validateData(): output format should be Unspecified but got ShaderTools::Format::Spirv\n"); + "ShaderTools::GlslangConverter::validateData(): output format should be Spirv or Unspecified but got ShaderTools::Format::Glsl\n"); } void AnyConverterTest::validatePropagatePreprocess() {