diff mbox series

[3/3] configure: Use FILES loop for all build tree symlinks

Message ID 20181030125005.28151-4-peter.maydell@linaro.org
State Superseded
Headers show
Series configure: symlink directories, not wildcarded files | expand

Commit Message

Peter Maydell Oct. 30, 2018, 12:50 p.m. UTC 
A few places in configure were doing ad-hoc calls to
the symlink function to set up symlinks from the build tree
back to the source tree. We have a loop that does this
already for all files and directories listed in the FILES
environment variable; use that instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 configure | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

-- 
2.19.1
diff mbox series

Patch

diff --git a/configure b/configure
index acb9a4d39e5..11ca69472a6 100755
--- a/configure
+++ b/configure
@@ -7392,6 +7392,8 @@  LINKS="$LINKS roms/seabios/Makefile roms/vgabios/Makefile"
 LINKS="$LINKS pc-bios/qemu-icon.bmp"
 LINKS="$LINKS .gdbinit scripts" # scripts needed by relative path in .gdbinit
 LINKS="$LINKS tests/acpi-test-data tests/hex-loader-check-data"
+LINKS="$LINKS tests/acceptance tests/data"
+LINKS="$LINKS tests/qemu-iotests/check"
 for bios_file in \
     $source_path/pc-bios/*.bin \
     $source_path/pc-bios/*.lid \
@@ -7428,25 +7430,13 @@  for rom in seabios vgabios ; do
     echo "RANLIB=$ranlib" >> $config_mak
 done
 
-# set up tests data directory
-for tests_subdir in acceptance data; do
-    if [ ! -e tests/$tests_subdir ]; then
-        symlink "$source_path/tests/$tests_subdir" tests/$tests_subdir
-    fi
-done
-
 # set up qemu-iotests in this build directory
 iotests_common_env="tests/qemu-iotests/common.env"
-iotests_check="tests/qemu-iotests/check"
 
 echo "# Automatically generated by configure - do not modify" > "$iotests_common_env"
 echo >> "$iotests_common_env"
 echo "export PYTHON='$python'" >> "$iotests_common_env"
 
-if [ ! -e "$iotests_check" ]; then
-    symlink "$source_path/$iotests_check" "$iotests_check"
-fi
-
 # Save the configure command line for later reuse.
 cat <<EOD >config.status
 #!/bin/sh