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

Commit

Permalink
Leftover from 1505497
Browse files Browse the repository at this point in the history
  • Loading branch information
@sebastianbergmann
sebastianbergmann committed Feb 10, 2015
1 parent 147ee48 commit 29dc4ed
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 50 deletions.
28 changes: 12 additions & 16 deletions src/4.5/en/configuration.xml
View file
Expand Up @@ -36,7 +36,6 @@
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
strict="false"
verbose="false">
<!-- ... -->
</phpunit>]]></screen>
Expand Down Expand Up @@ -118,10 +117,10 @@
<term><literal>timeoutForLargeTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@large</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@large</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -130,10 +129,10 @@
<term><literal>timeoutForMediumTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@medium</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@medium</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -142,17 +141,14 @@
<term><literal>timeoutForSmallTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests not marked as <literal>@medium</literal> or
<literal>@large</literal>. If a test does not complete within this
configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests not marked as
<literal>@medium</literal> or <literal>@large</literal>. If a test
does not complete within its configured timeout, it will fail.
</para>
</listitem>
</varlistentry>

</variablelist>

</section>

<section id="appendixes.configuration.testsuites">
Expand Down
30 changes: 13 additions & 17 deletions src/4.6/en/configuration.xml
View file
Expand Up @@ -13,7 +13,7 @@

<screen><![CDATA[<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
<!--bootstrap="/path/to/bootstrap.php"-->
Expand All @@ -36,7 +36,6 @@
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
strict="false"
verbose="false">
<!-- ... -->
</phpunit>]]></screen>
Expand Down Expand Up @@ -118,10 +117,10 @@
<term><literal>timeoutForLargeTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@large</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@large</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -130,10 +129,10 @@
<term><literal>timeoutForMediumTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@medium</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@medium</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -142,17 +141,14 @@
<term><literal>timeoutForSmallTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests not marked as <literal>@medium</literal> or
<literal>@large</literal>. If a test does not complete within this
configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests not marked as
<literal>@medium</literal> or <literal>@large</literal>. If a test
does not complete within its configured timeout, it will fail.
</para>
</listitem>
</varlistentry>

</variablelist>

</section>

<section id="appendixes.configuration.testsuites">
Expand Down
30 changes: 13 additions & 17 deletions src/4.7/en/configuration.xml
View file
Expand Up @@ -13,7 +13,7 @@

<screen><![CDATA[<phpunit
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.5/phpunit.xsd"
backupGlobals="true"
backupStaticAttributes="false"
<!--bootstrap="/path/to/bootstrap.php"-->
Expand All @@ -36,7 +36,6 @@
timeoutForSmallTests="1"
timeoutForMediumTests="10"
timeoutForLargeTests="60"
strict="false"
verbose="false">
<!-- ... -->
</phpunit>]]></screen>
Expand Down Expand Up @@ -118,10 +117,10 @@
<term><literal>timeoutForLargeTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@large</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@large</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -130,10 +129,10 @@
<term><literal>timeoutForMediumTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests marked as <literal>@medium</literal>. If a test does not
complete within this configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests marked as <literal>@medium</literal>.
If a test does not complete within its configured timeout, it will
fail.
</para>
</listitem>
</varlistentry>
Expand All @@ -142,17 +141,14 @@
<term><literal>timeoutForSmallTests</literal></term>
<listitem>
<para>
If the <literal>PHP_Invoker</literal> package is installed and
strict mode is enabled, this attribute sets the timeout for all
tests not marked as <literal>@medium</literal> or
<literal>@large</literal>. If a test does not complete within this
configured timeout, it will fail.
If time limits based on test size are enforced then this attribute
sets the timeout for all tests not marked as
<literal>@medium</literal> or <literal>@large</literal>. If a test
does not complete within its configured timeout, it will fail.
</para>
</listitem>
</varlistentry>

</variablelist>

</section>

<section id="appendixes.configuration.testsuites">
Expand Down

0 comments on commit 29dc4ed

Please sign in to comment.