[llvm-commits] CVS: nightlytest-serverside/NightlyTestAccept.php

[Jim Laskey]

Changes in directory nightlytest-serverside:

NightlyTestAccept.php updated: 1.45 -> 1.46
---
Log message:

remove blank tests - and problem still persists

---
Diffs of the changes:  (+14 -16)

 NightlyTestAccept.php |   30 ++++++++++++++----------------
 1 files changed, 14 insertions(+), 16 deletions(-)


Index: nightlytest-serverside/NightlyTestAccept.php
diff -u nightlytest-serverside/NightlyTestAccept.php:1.45 nightlytest-serverside/NightlyTestAccept.php:1.46
--- nightlytest-serverside/NightlyTestAccept.php:1.45	Sat Sep 16 11:08:23 2006
+++ nightlytest-serverside/NightlyTestAccept.php	Sat Sep 16 12:51:20 2006
@@ -339,10 +339,12 @@
  *
  *******************************************************************************/
 function AddProgram($program, $result, $type, $night) {
-  $query = "INSERT INTO program (program, result, type, night) VALUES".
-           " (\"$program\", \"$result\", \"$type\", $night)";
-  $program_query = mysql_query($query) or die(mysql_error());
-  mysql_free_result($program_query);
+  if (!StringIsNull($program)) {
+    $query = "INSERT INTO program (program, result, type, night) VALUES".
+             " (\"$program\", \"$result\", \"$type\", $night)";
+    $program_query = mysql_query($query) or die(mysql_error());
+    mysql_free_result($program_query);
+  }
 }
 
 /*******************************************************************************
@@ -360,10 +362,12 @@
  *
  *******************************************************************************/
 function AddTests($program, $result, $measure, $night) {
-  $query = "INSERT INTO tests (program, result, measure, night) VALUES".
-           " (\"$program\", \"$result\", \"$measure\", $night)";
-  $program_query = mysql_query($query) or die(mysql_error());
-  mysql_free_result($program_query);
+  if (!StringIsNull($program)) {
+    $query = "INSERT INTO tests (program, result, measure, night) VALUES".
+             " (\"$program\", \"$result\", \"$measure\", $night)";
+    $program_query = mysql_query($query) or die(mysql_error());
+    mysql_free_result($program_query);
+  }
 }
 
 
@@ -728,10 +732,7 @@
   $subpatterns = array();
   if (preg_match("/(TEST-)?(XPASS|PASS|XFAIL|FAIL):\s(.+?)\s(.+)/", $info, $subpatterns)) {
     list($ignore1, $ignore2, $result, $measure, $program) = $subpatterns;
-    $query = "INSERT INTO tests (program, result, measure, night) ".
-             "VALUES (\"$program\", \"$result\", \"$measure\", $night_id)";
-    $test_query = mysql_query($query) or die(mysql_error());
-    mysql_free_result($test_query);
+    AddTests($program, $result, $measure, $night_id);
   } else {
     print "Unrecognized test: $info\n";
   }
@@ -745,10 +746,7 @@
   $subpatterns = array();
   if (preg_match("/^(XPASS|PASS|XFAIL|FAIL):\s(.+):?/", $info, $subpatterns)) {
     list($ignore, $result, $program) = $subpatterns;
-  	$query = "INSERT INTO tests (program, result, measure, night) ".
-  	         "VALUES(\"$program\", \"$result\", \"dejagnu\", $night_id)";
-    $test_query = mysql_query($query) or die(mysql_error());
-    mysql_free_result($test_query);
+    AddTests($program, $result, "dejagnu", $night_id);
   }
 }