Skip to content

Commit

Permalink
servertest/utiltest: Optionally test only 1 screen
Browse files Browse the repository at this point in the history
It isn't necessary to test both screens when using sanitizers or
valgrind/helgrind.
  • Loading branch information
dcommander committed Nov 19, 2021
1 parent 2790086 commit 292ff50
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
7 changes: 6 additions & 1 deletion server/servertest.in
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,12 @@ NODL=
FAKERUTARGS=
DEPTH=24
IPV6=1
SCREENS="0 1"
WRAP=
XVFBARGS=
VGLTRANS=1
GLVND=0

while [ $# -gt 0 ]; do
case "$1" in
-nodl)
Expand All @@ -61,6 +63,9 @@ while [ $# -gt 0 ]; do
DEPTH=30
FAKERUTARGS=-nostereo
;;
-onescreen)
SCREENS=0
;;
-wrap)
WRAP=$2; shift
;;
Expand Down Expand Up @@ -108,7 +113,7 @@ if [ "$FAKEOPENCL" = "1" -a ! "$EGLBACKEND" = "1" ]; then
fi
echo

for SCREEN in 0 1; do
for SCREEN in $SCREENS; do

export DISPLAY=:42.$SCREEN

Expand Down
8 changes: 6 additions & 2 deletions util/utiltest.in
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ BIN=@CMAKE_RUNTIME_OUTPUT_DIRECTORY@
SSL=@VGL_USESSL@
DEPTHS="24 30"
IPV6=1
SCREENS="0 1"
WRAP=

while [ $# -gt 0 ]; do
Expand All @@ -34,6 +35,9 @@ while [ $# -gt 0 ]; do
-noipv6)
IPV6=0
;;
-onescreen)
SCREENS=0
;;
-wrap)
WRAP=$2; shift
;;
Expand Down Expand Up @@ -62,7 +66,7 @@ for depth in $DEPTHS; do
echo Xvfb started as process $PID
echo
sleep 2
for SCREEN in 0 1; do
for SCREEN in $SCREENS; do
echo \*\*\*\*\* Testing 1920x1200x$depth, Screen $SCREEN \*\*\*\*\*
DISPLAY=:42.$SCREEN $WRAP $BIN/fbxtest $NOSHM -time 0.2
DISPLAY=:42.$SCREEN $WRAP $BIN/fbxtest $NOSHM -time 0.2 -mt
Expand All @@ -79,7 +83,7 @@ for depth in $DEPTHS; do
echo Xvfb started as process $PID
echo
sleep 2
for SCREEN in 0 1; do
for SCREEN in $SCREENS; do
echo \*\*\*\*\* Testing 1024x768x$depth, Screen $SCREEN \*\*\*\*\*
DISPLAY=:42.$SCREEN $WRAP $BIN/fbxtest $NOSHM -time 0.2
DISPLAY=:42.$SCREEN $WRAP $BIN/fbxtest $NOSHM -time 0.2 -mt
Expand Down

0 comments on commit 292ff50

Please sign in to comment.