Merge: simplify glslangValidator test to support different versions of the tool