From ab61f812c4a9d21cae4290f3972f6769cb9773b1 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 11 Apr 2018 13:27:15 -0400
Subject: [PATCH] tests/installed: Move auto-build logic to playbook-run.sh

This makes it a bit more convenient to make a code change, then
`rm -rf build && ./playbook-run.sh ...`.

Closes: #1535
Approved by: jlebon
---
 tests/installed/playbook-run.sh | 6 ++++++
 tests/installed/run.sh          | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/installed/playbook-run.sh b/tests/installed/playbook-run.sh
index c1887297..3136899f 100755
--- a/tests/installed/playbook-run.sh
+++ b/tests/installed/playbook-run.sh
@@ -3,6 +3,12 @@
 # TEST_SUBJECTS being set.
 set -xeuo pipefail
 
+dn=$(cd $(dirname $0) && pwd)
+if ! test -d build; then
+    mkdir -p build
+    (cd build && ${dn}/../../ci/build-rpm.sh)
+fi
+
 # https://fedoraproject.org/wiki/CI/Tests
 if test -z "${TEST_SUBJECTS:-}"; then
     cat <<EOF
diff --git a/tests/installed/run.sh b/tests/installed/run.sh
index 497777a7..264a7436 100755
--- a/tests/installed/run.sh
+++ b/tests/installed/run.sh
@@ -5,11 +5,6 @@ set -xeuo pipefail
 
 dn=$(cd $(dirname $0) && pwd)
 
-if ! test -d build; then
-    mkdir -p build
-    (cd build && ${dn}/../../ci/build-rpm.sh)
-fi
-
 # TODO: parallelize this
 PLAYBOOKS=${PLAYBOOKS:-nondestructive.yml destructive.yml}
 for playbook in $PLAYBOOKS; do