From a9fc7ce1806d92779da9931c804a88ac444344ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Ekl=C3=B6f?= <daniel@ekloef.se>
Date: Mon, 10 Oct 2022 17:18:04 +0200
Subject: [PATCH] pgo: run xtgettcap without any arguments
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We execute xtgettcap in the parent terminal. Thus we don’t know if it
implements XTGETTCAP, and thus it’s not guaranteed to exit - it may
hang indefinitely waiting for a reply.

Fix by not actually quering anything.
---
 INSTALL.md        | 6 +++---
 pgo/full-inner.sh | 2 +-
 pgo/partial.sh    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index d2f4e3d4..4c15b7b4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -327,7 +327,7 @@ We will use the `pgo` binary along with input corpus generated by
 `scripts/generate-alt-random-writes.py`:
 
 ```sh
-./utils/xtgettcap name
+./utils/xtgettcap
 ./footclient --version
 ./foot --version
 tmp_file=$(mktemp)
@@ -373,7 +373,7 @@ This method requires a running Wayland session.
 We will use the script `scripts/generate-alt-random-writes.py`:
 
 ```sh
-./utils/xtgettcap name
+./utils/xtgettcap
 ./footclient --version
 foot_tmp_file=$(mktemp)
 ./foot \
@@ -387,7 +387,7 @@ rm ${foot_tmp_file}
 You should see a foot window open up, with random colored text. The
 window should close after ~1-2s.
 
-The first step, `./utils/xtgettcap name && ./footclient --version`
+The first step, `./utils/xtgettcap && ./footclient --version`
 might seem unnecessary, but is needed to ensure we have _some_
 profiling data for **all** binaries we build. Without this, the final
 link phase will fail.
diff --git a/pgo/full-inner.sh b/pgo/full-inner.sh
index 425d1ff0..c2205e5e 100755
--- a/pgo/full-inner.sh
+++ b/pgo/full-inner.sh
@@ -15,7 +15,7 @@ rm -f "${blddir}"/pgo-ok
 # To ensure profiling data is generated in the build directory
 cd "${blddir}"
 
-"${blddir}"/utils/xtgettcap name
+"${blddir}"/utils/xtgettcap
 "${blddir}"/footclient --version
 "${blddir}"/foot \
            --config=/dev/null \
diff --git a/pgo/partial.sh b/pgo/partial.sh
index 17de7175..6d6fdffe 100755
--- a/pgo/partial.sh
+++ b/pgo/partial.sh
@@ -21,7 +21,7 @@ rm -f "${blddir}"/pgo-ok
 # To ensure profiling data is generated in the build directory
 cd "${blddir}"
 
-"${blddir}"/utils/xtgettcap name
+"${blddir}"/utils/xtgettcap
 "${blddir}"/footclient --version
 "${blddir}"/foot --version
 "${blddir}"/pgo "${pgo_data}"