Changeset 23591

Timestamp:

2014/08/15 16:53:08 (10 years ago)

Author:

kimoto

Message:

#150 ユニットテスト環境の整備

phpunit.xml.distは環境に依存しないので1ファイルに統一

Location:

branches/version-2_13-dev

Files:

• .travis.yml (modified) (1 diff)
• appveyor.yml (modified) (1 diff)
• build.xml (modified) (2 diffs)
• phpunit.xml.dist (added)
• tests/phpunit.xml.base (deleted)
• tests/phpunit.xml.jenkins (deleted)

branches/version-2_13-dev/.travis.yml

@@ -24 +24 @@
 script:
   - mkdir -p reports/coverage
-  - phpunit --log-tap reports/tap.log --log-junit reports/unitreport.xml --coverage-html reports/coverage --coverage-clover reports/coverage/coverage.xml --bootstrap ./data/config/config.php --configuration tests/phpunit.xml.jenkins tests
+  - phpunit -c phpunit.xml.dist
   - grunt
 

branches/version-2_13-dev/appveyor.yml

@@ -64 +64 @@
 test_script:
   - php -i
-  - vendor\bin\phpunit.bat --bootstrap data\config\config.php --configuration tests\phpunit.xml.jenkins tests
+  - vendor\bin\phpunit.bat --bootstrap data\config\config.php tests

branches/version-2_13-dev/build.xml

@@ -4 +4 @@
   <target name="prepare-jenkins">
     <copy overwrite="true" file="data/config/config.php.jenkins" tofile="data/config/config.php"/>
-    <copy overwrite="true" file="tests/phpunit.xml.jenkins" tofile="tests/phpunit.xml"/>
   </target>
 
@@ -18 +17 @@
       output="reports/stdout.log"
       error="reports/stderr.log"
-      command="phpunit --log-tap reports/tap.log
-               --log-junit reports/unitreport.xml
-                       --coverage-html reports/coverage
-                       --coverage-clover reports/coverage/coverage.xml
-                       --configuration tests/phpunit.xml
-                       tests/" />
+      command="phpunit -c phpunit.xml.dist" />
   </target>
   <target name="checkstyle" description="Find coding standard violations using PHP_CodeSniffer creating a log file for the continuous integration server">