Browse Source

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

reduce directories under tests
(because automake is sloooow and the fewer dirs, the better)
master
Glenn Strauss 2 months ago
parent
commit
18ec4f419c
  1. 1
      configure.ac
  2. 0
      tests/docroot/404.html
  3. 0
      tests/docroot/404.pl
  4. 12
      tests/docroot/Makefile.am
  5. 0
      tests/docroot/cgi.pl
  6. 0
      tests/docroot/exec-date.shtml
  7. 0
      tests/docroot/index.html
  8. 0
      tests/docroot/index.txt
  9. 0
      tests/docroot/prefix.fcgi
  10. 0
      tests/docroot/ssi-include.shtml
  11. 0
      tests/docroot/ssi-include.txt
  12. 0
      tests/docroot/ssi.shtml
  13. 11
      tests/docroot/www/Makefile.am
  14. 10
      tests/prepare.sh

1
configure.ac

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

0
tests/docroot/www/404.html → tests/docroot/404.html

0
tests/docroot/www/404.pl → tests/docroot/404.pl

12
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

0
tests/docroot/www/cgi.pl → tests/docroot/cgi.pl

0
tests/docroot/www/exec-date.shtml → tests/docroot/exec-date.shtml

0
tests/docroot/www/index.html → tests/docroot/index.html

0
tests/docroot/www/index.txt → tests/docroot/index.txt

0
tests/docroot/www/prefix.fcgi → tests/docroot/prefix.fcgi

0
tests/docroot/www/ssi-include.shtml → tests/docroot/ssi-include.shtml

0
tests/docroot/www/ssi-include.txt → tests/docroot/ssi-include.txt

0
tests/docroot/www/ssi.shtml → tests/docroot/ssi.shtml

11
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

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

Loading…
Cancel
Save