X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gtests%2FLink.FromFile.cpp;h=2651a1e04c18a67e0af002fbd99c23eb5aa39860;hb=e4ad1bb68af90499ea63f65e75c44773b0948d5e;hp=331c5b2710ce0ba2863458cc7b6f374330d3d528;hpb=7d8141987cf07d12c31beeccde7efb49f02d0e75;p=platform%2Fupstream%2Fglslang.git diff --git a/gtests/Link.FromFile.cpp b/gtests/Link.FromFile.cpp index 331c5b2..2651a1e 100644 --- a/gtests/Link.FromFile.cpp +++ b/gtests/Link.FromFile.cpp @@ -48,15 +48,14 @@ TEST_P(LinkTest, FromFile) { const auto& fileNames = GetParam(); const size_t fileCount = fileNames.size(); - const EShMessages controls = DeriveOptions( - Source::GLSL, Semantics::OpenGL, Target::AST); + const EShMessages controls = DeriveOptions(Source::GLSL, Semantics::OpenGL, Target::AST); GlslangResult result; // Compile each input shader file. std::vector> shaders; for (size_t i = 0; i < fileCount; ++i) { std::string contents; - tryLoadFile(GLSLANG_TEST_DIRECTORY "/" + fileNames[i], + tryLoadFile(GlobalTestSettings.testRoot + "/" + fileNames[i], "input", &contents); shaders.emplace_back( new glslang::TShader(GetShaderStage(GetSuffix(fileNames[i])))); @@ -78,7 +77,7 @@ TEST_P(LinkTest, FromFile) // Check with expected results. const std::string expectedOutputFname = - GLSLANG_TEST_DIRECTORY "/baseResults/" + fileNames.front() + ".out"; + GlobalTestSettings.testRoot + "/baseResults/" + fileNames.front() + ".out"; std::string expectedOutput; tryLoadFile(expectedOutputFname, "expected output", &expectedOutput);