diff options
author | Brad Warren <bmw@eff.org> | 2017-05-03 22:45:22 +0300 |
---|---|---|
committer | Brad Warren <bmw@eff.org> | 2017-05-03 22:45:22 +0300 |
commit | c52ef81619c479c7081f579a9d1f6103a3d7004e (patch) | |
tree | 3ee0652892185104821d8a79f925a95b1cac3de6 | |
parent | a5bd0cf50ca6c823b70e71cbe3e9c061d5ed1525 (diff) |
store output in a fileoom
-rwxr-xr-x | certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test b/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test index 44268cb8f..9d0d0b5c1 100755 --- a/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test +++ b/certbot-apache/certbot_apache/tests/apache-conf-files/apache-conf-test @@ -4,6 +4,7 @@ # with each of the "passing" conf files. export EA=/etc/apache2/ +RESULT=$(mktemp) TESTDIR="`dirname $0`" cd $TESTDIR/passing @@ -40,6 +41,7 @@ function Cleanup() { else sudo mv "$TMP" "$APPEND_APACHECONF" fi + rm $RESULT } # if our environment asks us to enable modules, do our best! @@ -59,12 +61,12 @@ trap CleanupExit INT for f in *.conf ; do echo -n testing "$f"... Setup - RESULT=`echo c | sudo $(command -v certbot) -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t 2>&1` - if echo $RESULT | grep -Eq \("Which names would you like"\|"mod_macro is not yet"\) ; then + echo c | sudo $(command -v certbot) -vvvv --debug --staging --apache --register-unsafely-without-email --agree-tos certonly -t > $RESULT 2>&1 + if grep -Eq \("Which names would you like"\|"mod_macro is not yet"\) $RESULT ; then echo passed else echo failed - echo $RESULT + cat $RESULT echo echo FAILS=`expr $FAILS + 1` |