From 88498c4bfa915a1261a44326f6371cf349f0e03e Mon Sep 17 00:00:00 2001 From: Rob Savoye Date: Tue, 9 Dec 2014 12:04:17 -0700 Subject: heavily refactor to use functions from diff.php --- index.php | 228 ++++++++++++++++++++++++++------------------------------------ 1 file changed, 94 insertions(+), 134 deletions(-) diff --git a/index.php b/index.php index ed9ac1f..24b5aae 100644 --- a/index.php +++ b/index.php @@ -19,7 +19,7 @@ session_start(); include "support.php"; //include "xml.php"; -include "diff.php"; +//include "diff.php"; ?> @@ -29,33 +29,26 @@ include "diff.php"; TCWG Validation - + + + + + + + + This is so I can easily see if it's working at all

"; - -function get_xml_files($dir) -{ - - $array = array(); - - if ($handle = opendir($dir)) { - while (false !== ($entry = readdir($handle))) { - $len = strlen($entry); - $suffix = substr($entry, $len-4, $len); - if ($entry != "." && $entry != ".." && $suffix == ".xml") { -// echo "$len - $entry
"; - $array[] = "$dir/$entry"; - } - } - closedir($handle); - } - - return $array; -} - # A build directory looks like this: x86_64.aarch64-linux-gnu-BuildFarm488 function parse_build_dir ($dir) { @@ -71,130 +64,97 @@ function parse_build_dir ($dir) return $array; } -function selectmenu() -{ - echo ""; -} - // FIXME: for now, all files are accessible via the normal documentation root // for the web server. $docroot = $_SERVER["DOCUMENT_ROOT"]; $dir = "${docroot}abe/logs"; -// var_dump(is_dir($dir)); - -// Should return something like this: /var/www/abe/logs/gcc-linaro-5.0.0 -$topdir = glob($dir . '/*' , GLOB_ONLYDIR)[0]; -//print_r($topdir); -$revdirs = glob($topdir . '/*' , GLOB_ONLYDIR); -//var_dump($revdirs); - -for ($i=0; $i"; - $archdirs = glob($revdirs[$i] . '/*' , GLOB_ONLYDIR); - for ($j=0; $j"; - $dir = basename($archdirs[$i]); - $files[$dir] = get_xml_files($archdirs[$i]); -// var_dump($files); -// print_r($files); -// echo "

"; + +$foodir = new DirectoryIterator($dir); +$files = new RegexIterator($foodir, '/^gcc-linaro-[0-9].[0-9].[0-9]/'); +foreach($files as $file) { + if ($file->isDot()) { + continue; } -// echo "

"; +// echo "file = " . $file->getPathName() . "
"; + $topdirs[] = $file->getPathName(); + $foodir2 = new DirectoryIterator($file->getPathName()); + foreach($foodir2 as $file2) { + if ($file2->isDot()) { + continue; + } +// echo "file 2 = " . $file2->getPathName() . "
"; + $foodir3 = new DirectoryIterator($file2->getPathName()); + $revdirs[$file->getPathName()][] = $file2->getPathName(); + + foreach($foodir3 as $file3) { +// echo $file3->getPathName() . "
"; + if ($file3->isDot()) { + continue; + } + $foodir4 = new DirectoryIterator($file3->getPathName()); + $files4 = new RegexIterator($foodir4, '/.*sum*/'); + $archdirs[$file2->getPathName()][] = $file3->getPathName(); + foreach($files4 as $file4) { +// echo "file4 = " . $file4->getPathName() . "
"; + $sums[$file3->getPathName()][] = $file4->getPathName(); + } + sort($sums[$file3->getPathName()]); + } + } + sort($topdirs); } -$build = parse_build_dir("x86_64.aarch64-linux-gnu-BuildFarm488"); -//var_dump($build); - -$dir1 = "/var/www/abe/logs/gcc-linaro-5.0.0/gcc.git-02c7697d8819ada4bafbf2fb85b78cd8873c94e8/x86_64.armeb-linux-gnueabihf-BuildFarm486/libstdc++.sum"; -$dir2 = "/var/www/abe/logs/gcc-linaro-5.0.0/gcc.git-02C7697D8819ADA4BAFBF2FB85B78CD8873C94E8/x86_64.aarch64-linux-gnu-BuildFarm488/libstdc++.sum"; - -// Print the header main header -$tool = basename($dir1, ".sum"); -echo "

Comparing Test results for $tool

"; - -// Extract the differences -$unresolved = difftwofiles("UNRESOLVED", $dir1, $dir2); -$untested = difftwofiles("UNTESTED", $dir1, $dir2); -$xfailures = difftwofiles("XFAIL", $dir1, $dir2); -$xpasses = difftwofiles("XPASS", $dir1, $dir2); -$failures = difftwofiles("FAIL", $dir1, $dir2); -//$unsupported = difftwofiles("UNSUPPORTED", $dir1, $dir2); - -# Display the total number of Changes -$output = ""; -if ($unresolved[FIRSTFILE] > 0 || $unresolved[SECONDFILE] > 0) { - echo "$unresolved[KEYWORD] $unresolved[FIRSTFILE] $unresolved[SECONDFILE]
"; - $output .= "$unresolved[OUTPUT]

"; -} -if ($xfailures[FIRSTFILE] > 0 || $xfailures[SECONDFILE] > 0) { - echo "$xfailures[KEYWORD] $xfailures[FIRSTFILE] $xfailures[SECONDFILE]
"; - $output .= "$xfailures[OUTPUT]

"; -} -if ($failures[FIRSTFILE] > 0 || $xfailures[SECONDFILE] > 0) { - echo "$failures[KEYWORD] $failures[FIRSTFILE] $xfailures[SECONDFILE]
"; - $output .= "$failures[OUTPUT]

"; -} -if ($passes[FIRSTFILE] > 0 || $passes[SECONDFILE] > 0) { - echo "$passes[KEYWORD] $passes[FIRSTFILE] $passes[SECONDFILE]
"; - $output .= "$passes[OUTPUT]

"; -} -if ($xpasses[FIRSTFILE] > 0 || $xpasses[SECONDFILE] > 0) { - echo "$xpasses[KEYWORD] $xpasses[FIRSTFILE] $xpasses[SECONDFILE]
"; - $output .= "$xpasses[OUTPUT]

"; -} -if ($untested[FIRSTFILE] > 0 || $untested[SECONDFILE] > 0) { - echo "$untested[KEYWORD] $untested[FIRSTFILE] $untested[SECONDFILE]
"; - $output .= "untested[OUTPUT]

"; +echo "

"; + +// HTML doesn't have real tabs, but sometimes we need a lazy way to indent +// a line. +$tab = " "; + +foreach ($topdirs as $dir) { + $menutxt[] = ".|" . basename($dir) . "|||||1\n"; + foreach ($revdirs[$dir] as $rev) { + $man[$rev] = new SplFileObject($archdirs[$rev][0] . '/manifest.txt'); + foreach ($man[$rev] as $line => $content) { + if (strpos($content, "commit ") !== false) { + $commit[$rev] = $tab . strstr(rtrim($content), 'Author'); + // Word wrap so it's readable. + $commit[$rev] = wordwrap($commit[$rev], 150, "
" . $tab); + // Truncate cause sometimes the commit message is huge! + $commit[$rev] = substr($commit[$rev], 0, 500); + break; + } + } + $menutxt[] = "..|" . basename($rev) . "
" . $commit[$rev] . "|||||2\n"; + foreach ($archdirs[$rev] as $arch) { + $menutxt[] = "...|" . basename($arch) . "|||||2\n"; + foreach ($sums[$arch] as $sum) { + $build = parse_build_dir($arch); + $input = ""; + $menutxt[] = "....|" . $input . basename($sum) . "|||||2\n"; + } + } + } } +echo "

"; -//dodiff(); - -$dir1 = "/var/www/abe/logs/gcc-linaro-5.0.0/gcc.git-02c7697d8819ada4bafbf2fb85b78cd8873c94e8/x86_64.armeb-linux-gnueabihf-BuildFarm486/libstdc++.log"; -$dir2 = "/var/www/abe/logs/gcc-linaro-5.0.0/gcc.git-02C7697D8819ADA4BAFBF2FB85B78CD8873C94E8/x86_64.aarch64-linux-gnu-BuildFarm488/libstdc++.log"; +echo "

"; -// $fulldiff = array_merge($unresolved[PATTERN], $untested[PATTERN], $xpasses[PATTERN], $xfailures[PATTERN]); -// $file = new SplFileObject("$dir1"); -// foreach ($fulldiff as $pattern) { -// foreach ($file as $line => $content) { -// if (strpos($content, $pattern) !== false) { -// echo "LINENO = $line: $pattern
"; -// // echo "$content
"; -// // $file->seek($line); -// // break; -// } -// } -// } +require_once 'lib/PHPLIB.php'; +require_once 'lib/layersmenu-common.inc.php'; +require_once 'lib/treemenu.inc.php'; +$mid = new TreeMenu(); +$mid->setMenuStructureString(implode("",$menutxt)); +$mid->setIconsize(16, 16); +$mid->parseStructureForMenu('treemenu1'); +$mid->setSelectedItemByUrl('treemenu1', basename(__FILE__)); +print $mid->newTreeMenu('treemenu1'); -// echo "link text "; +echo "

"; - -echo "$output"; - -echo "

"; -echo "FIXME: $build[BUILD]
"; -echo "FIXME: $build[TARGET]
"; -echo "FIXME: $build[JOB]
"; +echo "

"; ?> -

- - \ No newline at end of file + -- cgit v1.2.3