Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tests: do not set Xft.dpi with integration tests (#2121) 

This should help with covering the methods for detection/fallback during
tests.

Ref: https://github.com/awesomeWM/awesome/pull/2109#issuecomment-346224956

Uses xrdb -q to check for X server being available.

Ignores the following warning:

> W: awesome: beautiful: can't get colorscheme from xrdb (using fallback).
This commit is contained in:
Daniel Hahler 2017-11-24 05:26:54 +01:00 committed by Emmanuel Lepage Vallée
parent 1326ec20fd
commit b0220a3804
1 changed files with 3 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/run.sh
View File

@ -150,33 +150,8 @@ wait_until_success() {
if (( verbose )); then set -x; fi if (( verbose )); then set -x; fi
} }
# Wait for DISPLAY to be available, and setup xrdb, # Wait for DISPLAY to be available, i.e. the X server is running.
# for awesome's xresources backend / queries. wait_until_success "X resources are ready" "DISPLAY='$D' xrdb -q >/dev/null 2>&1"
wait_until_success "setup xrdb" "printf 'Xft.dpi: 96
*.background: #002b36
*.foreground: #93a1a1
*.color0: #002b36
*.color1: #dc322f
*.color10: #859900
*.color11: #b58900
*.color12: #268bd2
*.color13: #6c71c4
*.color14: #2aa198
*.color15: #fdf6e3
*.color16: #cb4b16
*.color17: #d33682
*.color18: #073642
*.color19: #586e75
*.color2: #859900
*.color20: #839496
*.color21: #eee8d5
*.color3: #b58900
*.color4: #268bd2
*.color5: #6c71c4
*.color6: #2aa198
*.color7: #93a1a1
*.color8: #657b83
*.color9: #dc322f' | DISPLAY='$D' xrdb 2>&1"
# Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID. # Use a separate D-Bus session; sets $DBUS_SESSION_BUS_PID.
eval "$(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)" eval "$(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)"
@ -272,7 +247,7 @@ for f in $tests; do
error="$(grep --color -o --binary-files=text -E "$pattern" "$awesome_log" || true)" error="$(grep --color -o --binary-files=text -E "$pattern" "$awesome_log" || true)"
if [[ $fail_on_warning ]]; then if [[ $fail_on_warning ]]; then
# Filter out ignored warnings. # Filter out ignored warnings.
error="$(echo "$error" | grep -vE '.{19} W: awesome: (a_glib_poll|Cannot reliably detect EOF)' || true)" error="$(echo "$error" | grep -vE ".{19} W: awesome: (a_glib_poll|Cannot reliably detect EOF|beautiful: can't get colorscheme from xrdb)" || true)"
fi fi
if [[ -n "$error" ]]; then if [[ -n "$error" ]]; then
color_red color_red