Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .idea/phing.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
message="Enter class name with namespace." />
<phingcall target="vagrant:run">
<!-- After some properties for inside the Vagrant host. -->
<property name="vagrant.cmd" value='cd ${vagrant.dir}/app; php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url http://d8.dev --verbose --color --class "${test.class}"' />
<property name="vagrant.cmd" value='cd ${vagrant.dir}/app; php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url http://d8.dev --verbose --color --sqlite /dev/shm/test.sqlite --class "${test.class}"' />
</phingcall>
</target>

Expand All @@ -150,7 +150,7 @@
message="Enter group name." />
<phingcall target="vagrant:run">
<!-- After some properties for inside the Vagrant host. -->
<property name="vagrant.cmd" value="cd ${vagrant.dir}/app; php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url http://d8.dev --verbose --color '${test.group}'" />
<property name="vagrant.cmd" value="cd ${vagrant.dir}/app; php ./core/scripts/run-tests.sh --php `which php` --concurrency 12 --url http://d8.dev --verbose --color --sqlite /dev/shm/test.sqlite '${test.group}'" />

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make this option configurable using build.properties

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, but maybe the default property? Given alot of future testing will be done on Sqlite as default.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@larowlan this point is still pending.

</phingcall>
</target>

Expand Down
1 change: 1 addition & 0 deletions puppet/custom/drupal/manifests/packages.pp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
package { 'php5-mcrypt': ensure => 'installed', require => Apt::Ppa['ppa:ondrej/php5-oldstable'] }
package { 'php5-curl': ensure => 'installed', require => Apt::Ppa['ppa:ondrej/php5-oldstable'] }
package { 'php5-xdebug': ensure => 'installed', require => Apt::Ppa['ppa:ondrej/php5-oldstable'] }
package { 'php5-sqlite': ensure => 'installed', require => Apt::Ppa['ppa:ondrej/php5-oldstable'] }

# Ensure we have an update to date set of packages.
exec { 'apt-update':
Expand Down
1 change: 1 addition & 0 deletions puppet/provision.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ aptInstall git
aptInstall rubygems
aptInstall vim
gemInstall bundler
aptInstall sqlite

# Puppet run.
cd ${DIR} && bundle --path vendor/bundle
Expand Down