[tests] move tests/docroot/www contents up 1 level

reduce directories under tests
(because automake is sloooow and the fewer dirs, the better)

14 files changed, 16 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index 793ec82e..9bdf9773 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1696,7 +1696,6 @@ AC_CONFIG_FILES([\
   Makefile \
   src/Makefile \
   tests/docroot/Makefile \
-  tests/docroot/www/Makefile \
   tests/Makefile \
 ])
 AC_OUTPUT
diff --git a/tests/docroot/www/404.html b/tests/docroot/404.html
index ce72e899..ce72e899 100644
--- a/tests/docroot/www/404.html
+++ b/tests/docroot/404.html
diff --git a/tests/docroot/www/404.pl b/tests/docroot/404.pl
index eb5df2ee..eb5df2ee 100755
--- a/tests/docroot/www/404.pl
+++ b/tests/docroot/404.pl
diff --git a/tests/docroot/Makefile.am b/tests/docroot/Makefile.am
index d86055d8..f99830c7 100644
--- a/tests/docroot/Makefile.am
+++ b/tests/docroot/Makefile.am
@@ -1,2 +1,12 @@
-SUBDIRS=www
 GNUMAKEFLAGS=--no-print-directory -s
+EXTRA_DIST=\
+	404.html \
+	404.pl \
+	cgi.pl \
+	exec-date.shtml \
+	index.html \
+	index.txt \
+	prefix.fcgi \
+	ssi-include.shtml \
+	ssi-include.txt \
+	ssi.shtml
diff --git a/tests/docroot/www/cgi.pl b/tests/docroot/cgi.pl
index 97e00d31..97e00d31 100755
--- a/tests/docroot/www/cgi.pl
+++ b/tests/docroot/cgi.pl
diff --git a/tests/docroot/www/exec-date.shtml b/tests/docroot/exec-date.shtml
index 2c8535bc..2c8535bc 100644
--- a/tests/docroot/www/exec-date.shtml
+++ b/tests/docroot/exec-date.shtml
diff --git a/tests/docroot/www/index.html b/tests/docroot/index.html
index 3c149671..3c149671 100644
--- a/tests/docroot/www/index.html
+++ b/tests/docroot/index.html
diff --git a/tests/docroot/www/index.txt b/tests/docroot/index.txt
index 3c149671..3c149671 100644
--- a/tests/docroot/www/index.txt
+++ b/tests/docroot/index.txt
diff --git a/tests/docroot/www/prefix.fcgi b/tests/docroot/prefix.fcgi
index f091de63..f091de63 100644
--- a/tests/docroot/www/prefix.fcgi
+++ b/tests/docroot/prefix.fcgi
diff --git a/tests/docroot/www/ssi-include.shtml b/tests/docroot/ssi-include.shtml
index 317c6e3a..317c6e3a 100644
--- a/tests/docroot/www/ssi-include.shtml
+++ b/tests/docroot/ssi-include.shtml
diff --git a/tests/docroot/www/ssi-include.txt b/tests/docroot/ssi-include.txt
index 3ea09a82..3ea09a82 100644
--- a/tests/docroot/www/ssi-include.txt
+++ b/tests/docroot/ssi-include.txt
diff --git a/tests/docroot/www/ssi.shtml b/tests/docroot/ssi.shtml
index 473c5c65..473c5c65 100644
--- a/tests/docroot/www/ssi.shtml
+++ b/tests/docroot/ssi.shtml
diff --git a/tests/docroot/www/Makefile.am b/tests/docroot/www/Makefile.am
deleted file mode 100644
index 41411e82..00000000
--- a/tests/docroot/www/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-EXTRA_DIST=\
-	404.html \
-	404.pl \
-	cgi.pl \
-	exec-date.shtml \
-	index.html \
-	index.txt \
-	prefix.fcgi \
-	ssi-include.shtml \
-	ssi-include.txt \
-	ssi.shtml
diff --git a/tests/prepare.sh b/tests/prepare.sh
index eb6afb2b..e9a97265 100755
--- a/tests/prepare.sh
+++ b/tests/prepare.sh
@@ -28,11 +28,11 @@ mkdir -p "${tmpdir}/servers/www.example.org/pages/"           \
          "${tmpdir}/cache/compress/"
 
 # copy everything into the right places
-cp "${srcdir}/docroot/www/"*.html \
-   "${srcdir}/docroot/www/"*.pl \
-   "${srcdir}/docroot/www/"*.fcgi \
-   "${srcdir}/docroot/www/"*.shtml \
-   "${srcdir}/docroot/www/"*.txt \
+cp "${srcdir}/docroot/"*.html \
+   "${srcdir}/docroot/"*.pl \
+   "${srcdir}/docroot/"*.fcgi \
+   "${srcdir}/docroot/"*.shtml \
+   "${srcdir}/docroot/"*.txt \
    "${tmpdir}/servers/www.example.org/pages/"
 cp "${srcdir}/lighttpd.user" "${tmpdir}/"
 cp "${srcdir}/lighttpd.htpasswd" "${tmpdir}/"