Remove now obsolete language targets

buildlang* is not used anymore. Replace it with a single buildlang
target that can be used to test a single language.

Adopt tox.ini and test-languages.sh for a single publish target.

Change-Id: I5234e5c5a1c27b9ff85bb396f5bbc34f6447b576
This commit is contained in:
Andreas Jaeger 2014-07-03 22:14:58 +02:00
parent 82c24cb742
commit e0b4bd32d3
2 changed files with 11 additions and 28 deletions

View File

@ -35,17 +35,13 @@ function test_ja {
--only-book user-guide-admin
RET=$?
;;
publish-install)
setup_directory 'ja' 'install-guide'
openstack-doc-test -v --publish --check-build -l ja \
--only-book install-guide
RET=$?
;;
publish)
setup_directory 'ja' 'high-availability-guide' \
'user-guide' 'user-guide-admin'
'install-guide' 'user-guide' \
'user-guide-admin'
openstack-doc-test -v --publish --check-build -l ja \
--only-book high-availability-guide \
--only-book install-guide \
--only-book user-guide \
--only-book user-guide-admin
RET=$?
@ -62,9 +58,9 @@ function test_ja {
function test_language () {
case "$language" in
all)
test_ja
;;
all)
test_ja
;;
ja)
test_ja
;;
@ -78,7 +74,7 @@ function test_language () {
function usage () {
echo "Call the script as: "
echo "$0 PURPOSE LANGUAGE1 LANGUAGE2..."
echo "PURPOSE is either 'test', 'publish' or 'publish-install'"
echo "PURPOSE is either 'test' or 'publish'."
echo "LANGUAGE can also be 'all'."
}
@ -90,8 +86,6 @@ if [ "$1" = "test" ] ; then
PURPOSE="test"
elif [ "$1" = "publish" ] ; then
PURPOSE="publish"
elif [ "$1" = "publish-install" ] ; then
PURPOSE="publish-install"
else
usage
exit 1

19
tox.ini
View File

@ -56,23 +56,14 @@ sitepackages=True
whitelist_externals = bash
commands = bash tools/test-languages.sh test all
[testenv:buildlang-install]
# Run as "tox -e buildlang-install -- $LANG"
[testenv:buildlang]
# Run as "tox -e buildlang -- $LANG"
# Generatedocbook needs xml2po which cannot be installed
# in the venv. Since it's installed in the system, let's
# use sitepackages.
sitepackages=True
whitelist_externals = bash
commands = bash tools/test-languages.sh publish-install {posargs}
[testenv:buildlang-misc]
# Run as "tox -e buildlang-misc -- $LANG"
# Generatedocbook needs xml2po which cannot be installed
# in the venv. Since it's installed in the system, let's
# use sitepackages.
sitepackages=True
whitelist_externals = bash
commands = bash tools/test-languages.sh publish {posargs}
commands = bash tools/test-languages.sh test {posargs}
[testenv:publishlang]
# Generatedocbook needs xml2po which cannot be installed
@ -80,6 +71,4 @@ commands = bash tools/test-languages.sh publish {posargs}
# use sitepackages.
sitepackages=True
whitelist_externals = bash
commands =
bash tools/test-languages.sh publish all
bash tools/test-languages.sh publish-install all
commands = bash tools/test-languages.sh publish all