cvs: php-testfest-web /scripts/testfestsource/src displayresults.php failedfilelist.php testfesthourlytest.php viewfilecontents.php

zoe Sat May 9 15:29:43 2009 UTC Modified files: /php-testfest-web/scripts/testfestsource/src displayresults.php testfesthourlytest.php failedfilelist.php viewfilecontents.php Log: Updates http://cvs.php.net/viewvc.cgi/php-testfest-web/scripts/testfestsource/src/displayresults.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/scripts/testfestsource/src/displayresults.php diff -u php-testfest-web/scripts/testfestsource/src/displayresults.php:1.1 php-testfest-web/scripts/testfestsource/src/displayresults.php:1.2 --- php-testfest-web/scripts/testfestsource/src/displayresults.php:1.1 Wed May 6 18:29:06 2009 +++ php-testfest-web/scripts/testfestsource/src/displayresults.php Sat May 9 15:29:42 2009 @@ -33,7 +33,7 @@ $results = file($testfile); foreach($results as $line) { - if(preg_match('/^TEST.*([A-Z]{4}).*\[(.*)\]/', $line, $matches)) { + if(preg_match('/^TEST.*\s+([A-Z]{4})\s+.*\[(.*)\]/', $line, $matches)) { $base = substr($matches[2], 0, -5); $relativename = substr($base, strlen($testRunDir."/".$version."/")); $publishname = $publishDir."/".$version."/".$relativename; http://cvs.php.net/viewvc.cgi/php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php diff -u php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php:1.1 php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php:1.2 --- php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php:1.1 Wed May 6 18:29:06 2009 +++ php-testfest-web/scripts/testfestsource/src/testfesthourlytest.php Sat May 9 15:29:42 2009 @@ -41,6 +41,9 @@ //copy all the files into a directory thay can be run from foreach($phpVersion as $dir) { + //remove .phpt files from last run, necessary of people have moved things around in SVN. + shell_exec("find $testRunDir/$dir -name \"*.phpt\" | xargs -i rm {}"); + foreach ($filesToCopy as $file) { $from = trim($svnCheckOutDir."/testfest/".$file); $destFile = $testSetup->targetFileName($file); @@ -51,12 +54,11 @@ } foreach ($phpVersion as $dir) { + $testDir = $testRunDir."/".$dir; $run_tests = $phpBuildDir."/".$dir."/run-tests.php"; $phpExecutable = $phpBuildDir."/".$dir."/sapi/cli/php"; - $testDir = $testRunDir."/".$dir; echo "$phpExecutable -n $run_tests -n -p $phpExecutable $testDir\n"; $results = shell_exec("$phpExecutable -n $run_tests -n -p $phpExecutable $testDir"); - var_dump ($results); file_put_contents($testDir."/results", $results); } http://cvs.php.net/viewvc.cgi/php-testfest-web/scripts/testfestsource/src/failedfilelist.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/scripts/testfestsource/src/failedfilelist.php diff -u php-testfest-web/scripts/testfestsource/src/failedfilelist.php:1.1 php-testfest-web/scripts/testfestsource/src/failedfilelist.php:1.2 --- php-testfest-web/scripts/testfestsource/src/failedfilelist.php:1.1 Wed May 6 18:29:06 2009 +++ php-testfest-web/scripts/testfestsource/src/failedfilelist.php Sat May 9 15:29:42 2009 @@ -27,7 +27,10 @@ //'php5.2', ); + $base = $_GET['basename']; +$base = preg_replace('#[^a-z_-.]#', '', $base); + $_SESSION['basename'] = $base; $expFile = $base.".exp"; http://cvs.php.net/viewvc.cgi/php-testfest-web/scripts/testfestsource/src/viewfilecontents.php?r1=1.1&r2=1.2&diff_format=u Index: php-testfest-web/scripts/testfestsource/src/viewfilecontents.php diff -u php-testfest-web/scripts/testfestsource/src/viewfilecontents.php:1.1 php-testfest-web/scripts/testfestsource/src/viewfilecontents.php:1.2 --- php-testfest-web/scripts/testfestsource/src/viewfilecontents.php:1.1 Wed May 6 18:29:06 2009 +++ php-testfest-web/scripts/testfestsource/src/viewfilecontents.php Sat May 9 15:29:42 2009 @@ -29,14 +29,20 @@ $basename = $_SESSION['basename']; echo "<br><b>File:".$file."</b><br><br>"; -$contents = file($file); -foreach($contents as $line) { - echo "$line<br>"; -} +$file = realpath($file); + +if (strpos($file, '/var/www/html/publishresults/') !== 0) { + echo "Test file outside expected path<br />"; +} else { + $contents = file($file); + foreach($contents as $line) { + echo "$line<br />"; + } +} -echo "<br><br><a href=failedfilelist.php?basename=$basename>Back to file list</a><br>"; +echo "<br /><br /><a href='failedfilelist.php?basename=$basename'>Back to file list</a><br />"; ?> </body>