Test suite: move bootstrap to the main test script (#555)

* Refactor test suite: move bootstrap from being a fake test layer to explicit command

* Refactor test suite: move bootstrap from being a fake test layer to explicit command

diff --git a/test-builds.sh b/test-builds.sh
index c9e68ab94a23929f515261a26660e1897a2ce65d..4789079b63578eeaa484787b1d9e109b138d4bc5 100755 (executable)
--- a/test-builds.sh
+++ b/test-builds.sh
@@ -138,6 +138,12 @@ if [ -n "$cache_file" -a -e "$cache_file" -a "$remove_cache_file" = "true" ]; th
     rm $cache_file
 fi
 
+if [ -f "$top/configure" -a -f "$top/libltdl/configure" ]; then
+    echo "Already bootstrapped, skipping step"
+else
+    (cd "$top"; ./bootstrap.sh)
+fi
+
 # Decide what tests to run, $* contains test spec names or filenames.
 # Use all knows specs if $* is empty or a special macro called 'all'.
 if test -n "$*" -a "$*" != all; then

diff --git a/test-suite/buildtests/layer-00-bootstrap.opts b/test-suite/buildtests/layer-00-bootstrap.opts
deleted file mode 100644 (file)
index 9f6f5f6..0000000
--- a/test-suite/buildtests/layer-00-bootstrap.opts
+++ /dev/null
@@ -1,22 +0,0 @@
-## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
-##
-## Squid software is distributed under GPLv2+ license and includes
-## contributions from numerous individuals and organizations.
-## Please see the COPYING and CONTRIBUTORS files for details.
-##
-
-#
-## Special run - to be done before all others...
-#
-## locate the sources and go there...
-topb=`dirname $0`
-topc=`dirname ${topb}`
-cd ${topc}
-
-# echo "DEBUG: top=${top}"
-# echo "DEBUG: topB=${topb}"
-# echo "DEBUG: topC=${topc}"
-
-## Bootstrap the sources in case configure or makefiles changed.
-./bootstrap.sh
-exit $?