programs/unixbench/run: run under x for graphical tests

Signed-off-by: Philip Li <[email protected]>

Author: rli9

jobs/unixbench.yaml

@@ -38,6 +38,22 @@ unixbench:
     - hanoi
     - grep
     - sysexec
+
+---
+# execl uses a lot of mmap syscall which will cause perf to record
+# a huge amounts of those events. perf record then will not be able
+# to finish processing the captured perf.data before the test is done.
+perf-profile:
+  duration: 2
+
+unixbench:
+  test: execl
+
+---
+need_x: true
+
+unixbench:
+  test:
     - 2d-rects
     - 2d-lines
     - 2d-circle
@@ -49,13 +65,3 @@ unixbench:
     - 2d-blit
     - 2d-window
     - ubgears
-
----
-# execl uses a lot of mmap syscall which will cause perf to record
-# a huge amounts of those events. perf record then will not be able
-# to finish processing the captured perf.data before the test is done.
-perf-profile:
-  duration: 2
-
-unixbench:
-  test: execl

programs/unixbench/pkg/depends

@@ -8,3 +8,5 @@ x11-apps
 libx11-6
 freeglut3
 libgl1-mesa-dri
+xinit
+xorg

programs/unixbench/run

@@ -8,23 +8,16 @@
 ## of a Unix-like system; hence, multiple tests are used to test
 ## various aspects of the system's performance.
 
-. $LKP_SRC/lib/reproduce-log.sh
-. $LKP_SRC/lib/upload.sh
+. $LKP_SRC/lib/debug.sh
 
 cd $BENCHMARK_ROOT/unixbench || die "no $BENCHMARK_ROOT/unixbench"
 
-export LANG=C
+if [ "$need_x" = true ]; then
+	mkdir -p /tmp/.X11-unix
+	chmod 1777 /tmp/.X11-unix
+	chown root:root /tmp/.X11-unix
 
-[ -n "$runtime" ] || runtime=300
-
-# Each iteration in UnixBench is about 10 seconds
-iteration=$(( runtime / 10 ))
-
-[ $test = "shell8" ] && iteration=1
-
-[ -n "$nr_task" ] && other_params="-c $nr_task"
-
-cd UnixBench || exit
-log_cmd ./Run $test $other_params -i $iteration || exit
-
-upload_files -t results $BENCHMARK_ROOT/unixbench/UnixBench/results/*
+	xinit $LKP_SRC/programs/unixbench/xinitrc
+else
+	$LKP_SRC/programs/unixbench/xinitrc
+fi

programs/unixbench/xinitrc

@@ -0,0 +1,30 @@
+#!/bin/sh
+# - runtime
+# - test
+# - nr_task
+
+## UnixBench is the original BYTE UNIX benchmark suite. The purpose
+## of UnixBench is to provide a basic indicator of the performance
+## of a Unix-like system; hence, multiple tests are used to test
+## various aspects of the system's performance.
+
+. $LKP_SRC/lib/reproduce-log.sh
+. $LKP_SRC/lib/upload.sh
+
+cd $BENCHMARK_ROOT/unixbench || die "no $BENCHMARK_ROOT/unixbench"
+
+export LANG=C
+
+[ -n "$runtime" ] || runtime=300
+
+# Each iteration in UnixBench is about 10 seconds
+iteration=$(( runtime / 10 ))
+
+[ $test = "shell8" ] && iteration=1
+
+[ -n "$nr_task" ] && other_params="-c $nr_task"
+
+cd UnixBench || exit
+log_cmd ./Run $test $other_params -i $iteration || exit
+
+upload_files -t results $BENCHMARK_ROOT/unixbench/UnixBench/results/*