Merged pull request #954

xdebug · Mar 6, 2024 · b303190 · b303190
2 parents a27262d + 3dc4087
commit b303190
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/tests/coverage/dump-branch-coverage.inc b/tests/coverage/dump-branch-coverage.inc
@@ -1,9 +1,10 @@
 <?php
-require dirname(__FILE__) . '/../../contrib/branch-coverage-to-dot.php';
+require_once __DIR__ . '/../../contrib/branch-coverage-to-dot.php';
+require_once __DIR__ . '/../utils.inc';
 
 function dump_branch_coverage($info)
 {
-	file_put_contents(sys_get_temp_dir() . "/paths.dot", branch_coverage_to_dot( $info ) );
+	file_put_contents( getTmpDir() . "xdebug-paths.dot", branch_coverage_to_dot( $info ) );
 	ksort($info);
 
 	foreach ( $info as $fname => $file )
@@ -12,6 +13,10 @@ function dump_branch_coverage($info)
 		{
 			continue;
 		}
+		if ( preg_match( '/utils.inc$/', $fname ) )
+		{
+			continue;
+		}
 
 		if ( !isset( $file['functions'] ) )
 		{

diff --git a/tests/debugger/dbgp/dbgpclient.php b/tests/debugger/dbgp/dbgpclient.php
@@ -1,4 +1,6 @@
 <?php
+require_once __DIR__ . '/../../utils.inc';
+
 class DebugClient
 {
 	// free port will be selected automatically by the operating system
@@ -33,14 +35,7 @@ protected function getAddress()
 
 	public function __construct()
 	{
-		$envTmpDir = getenv('TEST_TMP_DIR');
-		$this->tmpDir = $envTmpDir !== false ? $envTmpDir : sys_get_temp_dir();
-		$this->tmpDir .= '/';
-		$workerId = getenv( 'TEST_PHP_WORKER' );
-		if ( $workerId !== false )
-		{
-			$this->tmpDir .= "{$workerId}-";
-		}
+		$this->tmpDir = getTmpDir();
 	}
 
 	private function open( &$errno, &$errstr )

diff --git a/tests/utils.inc b/tests/utils.inc
@@ -205,4 +205,18 @@ function mustNotBeExecuted( array $coverageInfo, array $lines )
 		echo "line #{$line} is present and not covered\n";
 	}
 }
+
+function getTmpDir() : string
+{
+	$envTmpDir = getenv('TEST_TMP_DIR');
+	$tmpDir = $envTmpDir !== false ? $envTmpDir : sys_get_temp_dir();
+	$tmpDir .= '/';
+	$workerId = getenv( 'TEST_PHP_WORKER' );
+	if ( $workerId !== false )
+	{
+		$tmpDir .= "{$workerId}-";
+	}
+
+	return $tmpDir;
+}
 ?>