workarounds: prefer modetest over xrandr for display output dumping.
Many CrOS systems have converted to freon. As such xrandr is no
longer available on those systems but has been replaced by modetest.
CL checks for modetest and makes appropriate call if available. If
not it continues to call xrandr.
BUG=none
TEST=manual
1. emerge-samus workarounds
2. cros deploy <samus host> workarounds
3. generate_logs
In generate_logs stdout see:
Dumped modetest output
instead of:
/usr/bin/generate_logs: line 70: /usr/bin/xrandr: No such file or directory
Also find expected output in diagnostic_logs/modetest_output.txt
Change-Id: I7c17d5ba04f3708aabeb1e66110d2b5263c63cc8
Reviewed-on: https://chromium-review.googlesource.com/268541
Reviewed-by: Kris Rambish <krisr@chromium.org>
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Todd Broch <tbroch@chromium.org>
Trybot-Ready: David James <davidjames@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>
diff --git a/generate_logs b/generate_logs
index 68eacff..542b240 100755
--- a/generate_logs
+++ b/generate_logs
@@ -66,9 +66,14 @@
sudo cp "${home_dir}/Local State" ${log_dir}/local_state.txt &&
echo "Copied Local State file"
-# Get the xrand output
-DISPLAY=:0.0 /usr/bin/xrandr --verbose > ${log_dir}/xrand_output.txt &&
- echo "Dumped xrand output"
+# Get the Display output. Prefer modetest (freon) over xrandr.
+if [ -e /usr/bin/modetest ]; then
+ /usr/bin/modetest > ${log_dir}/modetest_output.txt &&
+ echo "Dumped modetest output"
+else
+ DISPLAY=:0.0 /usr/bin/xrandr --verbose > ${log_dir}/xrand_output.txt &&
+ echo "Dumped xrandr output"
+fi
# Get modem status
/usr/bin/modem status > ${log_dir}/modem_status.txt &&
