Commit:    8fa799a2bedfbdc1e8c97a028b6db474160008fa
Author:    Peter Kokot <peterko...@gmail.com>         Sat, 20 Oct 2018 21:11:41 
+0200
Parents:   dccb4e68b53f40f7d597bec6bf56554cb4289946
Branches:  master

Link:       
http://git.php.net/?p=web/qa.git;a=commitdiff;h=8fa799a2bedfbdc1e8c97a028b6db474160008fa

Log:
Change --FILE_EXTERNAL-- file extensions

The --FILE_EXTERNAL-- sections can take any extension, however current
php code has *.php extension ignored in the Git repository and adding
such files to the repository conflicts with the generated *.php files
from the run-tests.php script. So the *.inc extension has been picked
which is used in other sections already.

Changed paths:
  M  phpt_details.php
  M  sample_tests/file012.php
  M  sample_tests/sample012.php


Diff:
diff --git a/phpt_details.php b/phpt_details.php
index e01005c..0af6d64 100644
--- a/phpt_details.php
+++ b/phpt_details.php
@@ -518,7 +518,7 @@ run-tests.php</p>
 path/to/file. Single line.</p>
 <p><b>Example 1 (snippet):</b><br/>
 <pre>--FILE_EXTERNAL--
-files/file012.php</pre></p>
+files/file012.inc</pre></p>
 <p><b>Example 1 (full):</b> <a 
href="sample_tests/sample012.php">sample012.phpt</a></p>
 </dd>
 
diff --git a/sample_tests/file012.php b/sample_tests/file012.php
index 986345c..073ee70 100644
--- a/sample_tests/file012.php
+++ b/sample_tests/file012.php
@@ -1,5 +1,5 @@
 <?php
-include("../../include/functions.php");
+include("../include/functions.php");
 
 $TITLE = "Sample Test [PHP-QAT: Quality Assurance Team]";
 $SITE_UPDATE = date("D M d H:i:s Y T", filectime(__FILE__));
@@ -8,7 +8,7 @@ common_header();
 ?>
 
 <div style="padding: 10px">
-<h1>Sample Test: file012.php</h1>
+<h1>Sample Test: file012.inc</h1>
 <p>Back to &quot;<a href="../../phpt_details.php">PHPT Test File 
Layout</a>&quot;</p>
 <pre>&lt;?php
   echo &quot;hello world\n&quot;;
diff --git a/sample_tests/sample012.php b/sample_tests/sample012.php
index bfd941a..009d999 100644
--- a/sample_tests/sample012.php
+++ b/sample_tests/sample012.php
@@ -13,7 +13,7 @@ common_header();
 <pre>--TEST--
 sample test for file_external
 --FILE_EXTERNAL--
-files/<a href="files/file012.php">file012.php</a>
+files/<a href="file012.php">file012.inc</a>
 --EXPECT--
 hello world
 </pre>

Reply via email to