summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@linux.intel.com>2017-05-02 12:37:17 +0300
committerMartin Peres <martin.peres@linux.intel.com>2017-05-02 12:37:17 +0300
commitcca9823538fe2133fde9612d002e88eb1f33c0a7 (patch)
tree9ba185725f880866d7103c4d8969ee6c36536fd3
parent172437d8dd109e2ce97f82d22f175b170eb3c2f1 (diff)
test/lightsmark: use the bundled libglew and fix the config path
-rw-r--r--tests.d/opengl/lightsmark.test7
-rw-r--r--user_parameters.sh.sample2
2 files changed, 5 insertions, 4 deletions
diff --git a/tests.d/opengl/lightsmark.test b/tests.d/opengl/lightsmark.test
index d3b97fe..260c2d4 100644
--- a/tests.d/opengl/lightsmark.test
+++ b/tests.d/opengl/lightsmark.test
@@ -1,4 +1,4 @@
-[ -e $LIGHTSMARK_FOLDER/bin/pc-linux64 ] || return 1
+[ -e "$LIGHTSMARK_FOLDER/Lightsmark2008.2.0/bin/pc-linux64" ] || return 1
# This is Lightsmark 2008 [Linux 64bit] log. Check it if benchmark doesn't work properly.
# Penumbra quality: 8/8 on Mesa DRI Intel(R) HD Graphics (Cherryview) .
@@ -12,9 +12,10 @@
__lightsmark__() {
local extract_fps="sed '/Finished/!d; s/.* fps = \(.*\).$/\1/'"
- cd $LIGHTSMARK_FOLDER/bin/pc-linux64
+ cd "$LIGHTSMARK_FOLDER/Lightsmark2008.2.0/bin/pc-linux64"
- LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH run_bench 0 ./backend silent $1 | eval $extract_fps
+ LD_LIBRARY_PATH=.:../../../lightsmark_lib/64bit/:$LD_LIBRARY_PATH \
+ run_bench 0 ./backend silent $1 | eval $extract_fps
}
while read name resolution; do
diff --git a/user_parameters.sh.sample b/user_parameters.sh.sample
index 2c2088c..8ce31ac 100644
--- a/user_parameters.sh.sample
+++ b/user_parameters.sh.sample
@@ -77,7 +77,7 @@ UNIGINE_VALLEY_FOLDER=/opt/benchmarks/unigine-valley-1.0
GPUTEST_FOLDER=/opt/benchmarks/GpuTest_Linux_x64_0.7.0
# Lightsmark settings
-LIGHTSMARK_FOLDER=/opt/benchmarks/lightsmark-1.2.0/Lightsmark2008.2.0
+LIGHTSMARK_FOLDER=/opt/benchmarks/lightsmark-1.2.0
# Citybench settings
CITYBENCH_FOLDER=/opt/replay_hbas_citybench