Browse Source

Yet another attempt to appease the travis gods.

pull/340/head
jonathangreen 12 years ago
parent
commit
1533de776e
  1. 2
      includes/ingest.form.inc
  2. 6
      tests/scripts/travis_setup.sh

2
includes/ingest.form.inc

@ -78,7 +78,7 @@ function islandora_ingest_form_init_form_state_storage(array &$form_state, array
if (empty($objects)) { if (empty($objects)) {
$objects[] = islandora_ingest_form_prepare_new_object($configuration); $objects[] = islandora_ingest_form_prepare_new_object($configuration);
} }
// Make sure the models actually exist // Make sure the models actually exist.
foreach ($configuration['models'] as $key => $model) { foreach ($configuration['models'] as $key => $model) {
if (!islandora_object_load($model)) { if (!islandora_object_load($model)) {
unset($configuration['models'][$key]); unset($configuration['models'][$key]);

6
tests/scripts/travis_setup.sh

@ -11,7 +11,11 @@ cd islandora_tomcat
export CATALINA_HOME='.' export CATALINA_HOME='.'
./bin/startup.sh ./bin/startup.sh
cd $HOME cd $HOME
pear update pear pear upgrade –force Console_Getopt
pear upgrade –force pear
pear upgrade-all
pear channel-discover pear.drush.org
pear channel-discover pear.drush.org
pear channel-discover pear.phpqatools.org pear channel-discover pear.phpqatools.org
pear channel-discover pear.netpirates.net pear channel-discover pear.netpirates.net
pear install pear/PHP_CodeSniffer pear install pear/PHP_CodeSniffer

Loading…
Cancel
Save