Permalink
Browse files

Fix PHPUnit dependancies

Make sure that the PHP DOM module is installed before installing PHPUnit
  • Loading branch information...
1 parent df5df38 commit 4403eae0babff2574906a08654bc8c2a7c1e805a @shanethehat shanethehat committed Mar 16, 2013
Showing with 11 additions and 7 deletions.
  1. +11 −7 puppet/modules/joindin/manifests/test/test.pp
@@ -7,7 +7,7 @@
# Install required PEAR modules for test suite
package { 'php-pear':
- #require => Notify['running'],
+ #require => Package['php'],
}
# Discover the phpunit pear channel first - must do this separately because
@@ -17,11 +17,19 @@
require => Package['php-pear'],
}
+ # PHP DOM extension required by PHPUnit on CentOS
+ package { 'php-xml':
+ require => Package['php-pear'],
+ }
+
# Install test-suite tools
- exec { 'php-unit':
+ exec { 'phpunit':
creates => '/usr/bin/phpunit',
command => 'pear install phpunit/PHPUnit',
- require => Exec['phpunit-channel'],
+ require => [
+ Exec['phpunit-channel'],
+ Package['php-xml'],
+ ],
before => Notify['test'],
}
@@ -42,10 +50,6 @@
before => Notify['test'],
}
- package { 'php-xml':
- require => Package['php-pear'],
- }
-
exec { 'pdepend':
creates => '/usr/bin/pdepend',
command => 'pear channel-discover pear.pdepend.org && \

0 comments on commit 4403eae

Please sign in to comment.