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

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

configure.ac

@@ -1696,7 +1696,6 @@ AC_CONFIG_FILES([\
   Makefile \
   src/Makefile \
   tests/docroot/Makefile \
-  tests/docroot/www/Makefile \
   tests/Makefile \
 ])
 AC_OUTPUT

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

tests/docroot/www/Makefile.am

@@ -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

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}/"