Fix build to ignore worker shell scripts

AKSW · Oct 23, 2013 · d35d96b · d35d96b
1 parent 8dc5627
commit d35d96b
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 16 deletions.
diff --git a/application/shell.worker.client.php b/application/shell.worker.client.php
@@ -5,7 +5,6 @@
  *
  * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
- * @codeCoverageIgnore
  */
 
 /**

diff --git a/application/shell.worker.php b/application/shell.worker.php
@@ -5,7 +5,6 @@
  *
  * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
  * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
- * @codeCoverageIgnore
  */
 
 /**

diff --git a/application/tests/integration/phpunit.xml.dist b/application/tests/integration/phpunit.xml.dist
@@ -18,6 +18,7 @@
             <exclude>
                 <directory>../../../application/scripts</directory>
                 <directory>../../../application/tests</directory>
+                <directory>../../../application/shell.*</directory>
             </exclude>
         </whitelist>
     </filter>

diff --git a/application/tests/unit/phpunit.xml.dist b/application/tests/unit/phpunit.xml.dist
@@ -18,6 +18,7 @@
                 <exclude>
                     <directory>../../../application/scripts</directory>
                     <directory>../../../application/tests</directory>
+                    <directory>../../../application/shell.*</directory>
                 </exclude>
             </whitelist>
         </filter>

diff --git a/build.xml b/build.xml
@@ -128,21 +128,17 @@
     </target>
 
     <target name="phpunit" depends="directories" description="Run unit tests with PHPUnit">
-        <exec dir="${basedir}/application/tests/unit/" executable="phpunit" failonerror="true">
-            <arg value="--configuration=${basedir}/build/phpunit.xml" />
-        </exec>
+        <exec dir="${basedir}/application/tests/unit/" executable="phpunit" failonerror="true" />
     </target>
 
     <target name="phpunit-integration-mysql" depends="phpunit" description="Run unit tests with PHPUnit">
         <exec dir="${basedir}/application/tests/integration/" executable="phpunit" failonerror="true">
-            <arg value="--configuration=${basedir}/build/phpunit.xml" />
             <env key="EF_STORE_ADAPTER" value="zenddb" />
         </exec>
     </target>
 
     <target name="phpunit-integration-virtuoso" depends="phpunit" description="Run unit tests with PHPUnit">
         <exec dir="${basedir}/application/tests/integration/" executable="phpunit" failonerror="true">
-            <arg value="--configuration=${basedir}/build/phpunit.xml" />
             <env key="EF_STORE_ADAPTER" value="virtuoso" />
         </exec>
     </target>

diff --git a/build/phpunit.xml b/build/phpunit.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,7 +5,6 @@ @@
      *
      * @copyright Copyright (c) 2012, {@link http://aksw.org AKSW}
      * @license http://opensource.org/licenses/gpl-license.php GNU General Public License (GPL)
-     * @codeCoverageIgnore
      */
     /**
@@ Expand Down @@