From b91d6250bc9cb9ccecc72e9de9d7731fd871b30c Mon Sep 17 00:00:00 2001 From: qadan Date: Thu, 17 Oct 2013 17:46:12 +0000 Subject: [PATCH 1/2] let's get a more explicit CATALINA_HOME --- tests/scripts/travis_setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 19c7db78..1d5a8dff 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -8,7 +8,7 @@ cd $HOME git clone git://github.com/Islandora/tuque.git git clone -b $FEDORA_VERSION git://github.com/Islandora/islandora_tomcat.git cd islandora_tomcat -export CATALINA_HOME='.' +export CATALINA_HOME=`pwd` ./bin/startup.sh cd $HOME pear upgrade --force Console_Getopt From 7a116af44b477cb71a9e3367a9cafbbe84cbf589 Mon Sep 17 00:00:00 2001 From: qadan Date: Thu, 17 Oct 2013 17:55:15 +0000 Subject: [PATCH 2/2] for heaven's sake --- tests/datastream_validators.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/datastream_validators.inc b/tests/datastream_validators.inc index 43867f50..4c69788b 100644 --- a/tests/datastream_validators.inc +++ b/tests/datastream_validators.inc @@ -118,7 +118,8 @@ function islandora_validate_image_datastream($object, $datastream) { /** * Asserts the validity of any .tif/.tiff datastream. * - * Does not use the islandora_assert_valid() function, as this is not a simple true/false. + * Does not use the islandora_assert_valid() function, as this is not a simple + * true/false. * * @param AbstractObject $object * The PID of the object.