Changeset 29495 for other-projects/nightly-tasks/diffcol/trunk/diffcol

Timestamp:

2014-11-28T21:01:27+13:00 (9 years ago)

Author:

ak19

Message:

Related to previous commit 29494 accidentally committed under sjs49 and which was prematurely committed. That commit and this one adds a debug flag to the run_test action of the diffcol task, that will store the intermediate debug files in the top level diffcol folder for inspection.

Location:

other-projects/nightly-tasks/diffcol/trunk/diffcol

Files:

• diffcol.pl (modified) (8 diffs)
• gdbdiff.pm (modified) (3 diffs)

other-projects/nightly-tasks/diffcol/trunk/diffcol/diffcol.pl

@@ -58 +58 @@
 }
 
+$gv_blnDebugging = 0;
 $gv_blnErrorStop = "false";
 $gv_blnErrorShow = "false";
@@ -334 +335 @@
     {
     #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
-    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol);
+    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os,$strTestCol,$strModelCol, $gv_blnDebugging);
     if($strGdbError ne "")
     {
@@ -435 +436 @@
         print "<error>usage incorrect</error>\n";
     } else {
-        print STDERR "Usage: $strProgName test-col [more-col] [-verbosity d] [-mode modes] [-eshow] [-estop]\n";
+        print STDERR "Usage: $strProgName test-col [more-col] [-verbosity d] [-mode modes] [-eshow] [-estop] [-debug]\n";
     }
     Help("Error: used incorrect parameters");
@@ -455 +456 @@
         'type' => "flag",
         'argu' => "NULL" ,
-        'descrip' => "Set then system will stop once it meet an error"},
+        'descrip' => "Set then system will stop once it meets an error"},
       { 'name' => "eshow",
         'type' => "flag",
         'argu' => "NULL" ,
-        'descrip' => "Set then system will show the error summary"}
+        'descrip' => "Set then system will show the error summary"},
+      { 'name' => "debug",
+        'type' => "flag",
+        'argu' => "NULL" ,
+        'descrip' => "If set, stores intermediate diff files in toplevel diffcol folder"}
       ];
     
@@ -749 +754 @@
         } # finished special processing of doc.xml files
         
-        my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory       
-#       &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
-#       &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
-#       if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
-#       &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
-#       &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
-#       }
-        
+
+        if($gv_blnDebugging) {# && $gv_intVerbosity > 0) {
+            my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory       
+            &gdbdiff::print_string_to_file($model_contents, $savepath."model_docmets.xml");
+            &gdbdiff::print_string_to_file($test_contents, $savepath."test_docmets.xml");
+#           if($strModel =~ m/(HASH0164.dir)/) { # list the HASH dirs for which you want the doc.xml file generated, to inspect specific doc.xml files
+#           &gdbdiff::print_string_to_file($model_contents, $savepath."$1_model_doc.xml");
+#           &gdbdiff::print_string_to_file($test_contents, $savepath."$1_test_doc.xml");
+#           }
+        }       
 
         
@@ -950 +957 @@
 sub main
 {
-    my ($intVerbosity,$strErrorStop,$strErrorShow,$strMode,$test_os,$model_os);
+    my ($intVerbosity,$strErrorStop,$strErrorShow,$strMode,$test_os,$model_os,$debugging);
     my $strProgName = $0; 
     my $intArgc = scalar(@ARGV);
@@ -958 +965 @@
         'estop//off', \$strErrorStop, 
         'eshow//off', \$strErrorShow, 
+        'debug', \$debugging, 
         'verbosity/\d+/1', \$intVerbosity, 
         'mode/[\w\-]+/all', \$strMode,
@@ -976 +984 @@
     $gv_model_os = $model_os; # tends to be linux
 
+    $gv_blnDebugging = $debugging;
     $gv_blnErrorStop = $strErrorStop;
     $gv_blnErrorShow = $strErrorShow;

other-projects/nightly-tasks/diffcol/trunk/diffcol/gdbdiff.pm

@@ -73 +73 @@
 sub test_gdb
 {
-    my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os, $strTestCol, $strModelCol) = @_;
+    my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os, $strTestCol, $strModelCol, $debugging) = @_;
 
    # print "Now is testing database\n";
@@ -81 +81 @@
     my $test_text = read_db($full_testdb);
 
-#   my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory
-#   print_string_to_file($test_text, $savepath.$dbname."_test.out1");   
-#   print_string_to_file($model_text, $savepath.$dbname."_model.out1");
+    my $savepath = &getcwd."/../"; # TASK_HOME env var does not exist at this stage, but it's one level up from current directory
+    if($debugging) {
+    print_string_to_file($test_text, $savepath.$dbname."_test.out1");   
+    print_string_to_file($model_text, $savepath.$dbname."_model.out1");
+    }
 
     # filter out the fields that can be ignored in the two database files
@@ -270 +272 @@
     }   
 
-    # now can go back to using $model_text and $test_text
-#   print_string_to_file($test_text, $savepath.$dbname."_test.out");    
-#   print_string_to_file($model_text, $savepath.$dbname."_model.out");
+    # now can go back to using $model_text and $test_text
+
+    if($debugging) {
+    print_string_to_file($test_text, $savepath.$dbname."_test.out");    
+    print_string_to_file($model_text, $savepath.$dbname."_model.out");
+    }
     
     my $report_type = "OldStyle"; # Can not change this type.