Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'master' into feature/db-story-35
Browse files Browse the repository at this point in the history
[zen-35]

Conflicts:
	library/Zend/Db/Sql/Select.php
	tests/Zend/Db/Sql/SelectTest.php
  • Loading branch information
Show file tree
Hide file tree
Showing 4 changed files with 90 additions and 0 deletions.
9 changes: 9 additions & 0 deletions .travis.yml
@@ -0,0 +1,9 @@
language: php

php:
- 5.3
- 5.4

before_install: cp tests/TravisTestConfiguration.php tests/TestConfiguration.php

script: ./.travis/run-tests.sh
14 changes: 14 additions & 0 deletions .travis/run-tests.sh
@@ -0,0 +1,14 @@
#!/bin/bash
travisdir=$(dirname $(readlink /proc/$$/fd/255))
testdir="$travisdir/../tests"
testedcomponents=(`cat "$travisdir/tested-components"`)
result=0

for tested in "${testedcomponents[@]}"
do
echo "$tested:"
phpunit -c $testdir/phpunit.xml $testdir/$tested
let "result = $result || $?"
done

exit $result
9 changes: 9 additions & 0 deletions .travis/skipped-components
@@ -0,0 +1,9 @@
Zend/Amf
Zend/Barcode
Zend/Date
Zend/Feed
Zend/Queue
Zend/Service
Zend/Test
Zend/Translator
Zend/Wildfire
58 changes: 58 additions & 0 deletions .travis/tested-components
@@ -0,0 +1,58 @@
Zend/Acl
Zend/Authentication
Zend/Cache
Zend/Captcha
Zend/Cloud
Zend/Code
Zend/Config
Zend/Console
Zend/Crypt
Zend/Currency
Zend/Db
Zend/Di
Zend/Docbook
Zend/Dojo
Zend/Dom
Zend/EventManager
Zend/Feed/Reader
Zend/Feed/Writer
Zend/File
Zend/Filter
Zend/Form
Zend/GData
Zend/Http
Zend/InfoCard
Zend/Json
Zend/Ldap
Zend/Loader
Zend/Locale
Zend/Log
Zend/Mail
Zend/Markup
Zend/Measure
Zend/Memory
Zend/Mime
Zend/Module
Zend/Mvc
Zend/Navigation
Zend/OAuth
Zend/OpenId
Zend/Paginator
Zend/Pdf
Zend/ProgressBar
Zend/RegistryTest.php
Zend/Rest
Zend/Search
Zend/Serializer
Zend/Server
Zend/Session
Zend/Soap
Zend/Stdlib
Zend/Tag
Zend/Text
Zend/TimeSync
Zend/Uri
Zend/Validator
Zend/VersionTest.php
Zend/View
Zend/XmlRpc

0 comments on commit fa239e0

Please sign in to comment.