compliance-ogl patch

[uncle_fungus]

This patch ensures that the compliance-ogl patch can use the locally compiled libGLEW rather than relying on the system-wide version which might not be installed, or be the correct version.

diff --git a/pts/test-resources/compliance-ogl/install.sh b/pts/test-resources/compliance-ogl/install.sh
index f3f9c6a..677d75a 100644
--- a/pts/test-resources/compliance-ogl/install.sh
+++ b/pts/test-resources/compliance-ogl/install.sh
@@ -5,7 +5,8 @@ cd glew/
 make -j $NUM_CPU_JOBS
 cd ..

-echo "#!/bin/sh
-./glew/bin/glewinfo | grep GL_VERSION" > compliance-ogl
+cat > compliance-ogl << EOT
+#!/bin/sh
+LD_LIBRARY_PATH=glew/lib/:\$LD_LIBRARY_PATH ./glew/bin/glewinfo | grep GL_VERSION
+EOT
 chmod +x compliance-ogl
-

[Kano]

Using that code makes it impossible to "move" the startup script. Maybe you could use (not tested):

cat > compliance-ogl << 'EOT'
#!/bin/sh
LD_LIBRARY_PATH=glew/lib:$LD_LIBRARY_PATH ./glew/bin/glewinfo | grep GL_VERSION
EOT

Adding $(pwd) hardcoded gives no extra info.

[uncle_fungus]

That does indeed work. I had the absolute path in there as I thought (incorrectly) that LD_LIBRARY_PATH didn't work with relative paths.

[Michael]

In git, thanks to both of you.