Changeset 28172 for other-projects

Timestamp:

2013-08-27T21:03:55+12:00 (11 years ago)

Author:

ak19

Message:

task.pl now takes a model_os param as argument to the run_test command and passes in the test_OS and model_OS variables to diffcol.pl. These specify on what Operating System the model collections were built and what the current OS is, on which the test collections will be built when the tests are run and diffed. This will provide a more foolproof way for diffcol to work out on what OS the model collection was generated and what the current OS is (or what OS task.pl chooses to specify as the current OS for test collections).

Location:

other-projects/nightly-tasks/diffcol/trunk

Files:

• diffcol/diffcol.pl (modified) (6 diffs)
• diffcol/gdbdiff.pm (modified) (2 diffs)
• task.pl (modified) (8 diffs)

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

@@ -48 +48 @@
 
 #--Global Variables Declaration-----------
+my ($gv_test_os, $gv_model_os); # still just file globals
+
 $gv_strModelColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/model-collect");
 $gv_strTestColRoot = &FileUtils::filenameConcatenate($ENV{'GSDLHOME'},"/collect");
@@ -327 +329 @@
     {
     #my $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb);
-    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb,$strColName);
+    $strGdbError = gdbdiff::test_gdb($strModelGdb, $strTestGdb, $strColName,$gv_test_os, $gv_model_os);
     if($strGdbError ne "")
     {
@@ -656 +658 @@
         # equalise/normalise the two doc.xml/docmets.xml files for OS differences, if there are any
         # before comparing a windows test with a linux model or vice-versa
-        my $testIsWin = &isDocOrMETSXMLFileWindows($test_contents);
-        my $modelIsWin = &isDocOrMETSXMLFileWindows($model_contents);
+        my $testIsWin = ($gv_test_os ne "compute") ? ($gv_test_os eq "windows") : &isDocOrMETSXMLFileWindows($test_contents);
+        my $modelIsWin = ($gv_model_os ne "compute") ? ($gv_model_os eq "windows") : &isDocOrMETSXMLFileWindows($model_contents);
         
         if($testIsWin != $modelIsWin) { # one of the 2 collections is built on windows, the other on linux, so need to make newlines constant
@@ -943 +945 @@
 sub main
 {
-    my ($intVerbosity,$strErrorStop,$strErrorShow,$strMode);
+    my ($intVerbosity,$strErrorStop,$strErrorShow,$strMode,$test_os,$model_os);
     my $strProgName = $0; 
     my $intArgc = scalar(@ARGV);
@@ -953 +955 @@
         'verbosity/\d+/1', \$intVerbosity, 
         'mode/[\w\-]+/all', \$strMode,
-        'output/[\w\-]+/text', \$strOutputFormat
+        'output/[\w\-]+/text', \$strOutputFormat,
+        'testos/(windows|linux|darwin|compute)/compute', \$test_os, # param-name,regex,default
+        'modelos/(windows|linux|darwin|compute)/compute', \$model_os # actually defaults to linux in task.pl
         )) {
         PrintUsage($strProgName);
@@ -963 +967 @@
         die "\n";
     }
+
+    $gv_test_os = $test_os; # if not specified, defaults to "compute"
+    $gv_model_os = $model_os; # tends to be linux
 
     $gv_blnErrorStop = $strErrorStop;

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

@@ -46 +46 @@
 sub test_gdb
 {
-    my ($full_modeldb, $full_testdb,$strColName) = @_;
+    my ($full_modeldb, $full_testdb, $strColName, $test_os, $model_os) = @_;
 
    # print "Now is testing database\n";
@@ -78 +78 @@
     # in test and model collection to an even base for comparison
     
-    my $testIsWin = &isDBWindowsSensitive($dbname, $test_text);
-    my $modelIsWin = &isDBWindowsSensitive($dbname, $model_text);
+    my $testIsWin = ($test_os ne "compute") ? ($test_os eq "windows") : &isDBWindowsSensitive($dbname, $test_text);
+    my $modelIsWin = ($model_os ne "compute") ? ($model_os eq "windows") : &isDBWindowsSensitive($dbname, $model_text);
     
     if($testIsWin == $modelIsWin) {     

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

@@ -47 +47 @@
 }
 
+my $test_os = $isWin ? "windows" : ($isMac ? "darwin" : "linux");
+my $model_os = "linux"; # default
 
 # TASK_HOME should be the toplevel diffcol folder
@@ -98 +100 @@
 my @collections = ();
 
+# run_test can take any number of args
 if(scalar(@ARGV) > 1 && $ARGV[0] ne "run_test") {
+    print STDERR "**** Wrong number of arguments\n";
     &printusage();
     exit -1;
@@ -111 +115 @@
     case qr/^(setup_greenstone|run_test|summarise|upload|all)$/ { $action=$ARGV[0]; }
     else { 
-        print STDERR "Bad subcommand.\n"; 
+        print STDERR "**** Bad subcommand.\n"; 
         &printusage; 
         exit -1;
@@ -117 +121 @@
     }
     
-    # run_test action can take a subaction: nosvn|justdiff. 
+    # run_test action can take a subaction: nosvn|justdiff. It can also take --modelOS (windows|linux|darwin)
     # nosvn: uses the model-collect as static and copies it over to collect, rebuilding what's currently in model-collect instead of copying 
     # it out from the svn model-collect again.
@@ -125 +129 @@
         shift @collections; # remove action from array
         
-        if($ARGV[1] =~ m@^--@) {
-            shift @collections; # remove subaction from array
+        for (my $i=0; $i < scalar(@ARGV); $i++) { 
+            if($ARGV[$i] =~ m@^--@) {
+            shift @collections; # remove subaction/flag from array
             
-            $subaction = $ARGV[1];          
+            $subaction = $ARGV[$i];
             if($subaction eq "--justdiff") {
-                $use_local_rebuild = $use_static_model = 1;
+                $use_local_rebuild = $use_static_model = 1;
             } elsif ($subaction eq "--nosvn") {
-                $use_static_model = 1;
+                $use_static_model = 1;
+            #} elsif ($subaction =~ m/\-\-testOS/i && defined $ARGV[$i+1]) {
+            #    $test_os = $ARGV[$i+1];
+            #    $i++;
+            #    shift @collections; # remove test_os value from array
+            } elsif ($subaction =~ m/\-\-modelOS/i && defined $ARGV[$i+1] && $ARGV[$i+1] =~ m/windows|linux|darwin/i) {
+                $model_os = $ARGV[$i+1];
+                $i++;
+                shift @collections; # remove model_os value from array
+                #print STDERR "Model_os specified: $model_os\n";
             } else {
-                print STDERR "Bad subaction.\n"; 
-                &printusage; 
-                exit -1;
-            }           
+                print STDERR "**** Bad subaction/value: ".$ARGV[$i]."\n"; 
+                &printusage; 
+                exit -1;
+            }
+            }
         }
         
@@ -238 +253 @@
 sub printusage
 {
-    print STDERR "Run as: $0 (help|setup_greenstone|run_test <--justdiff|--nosvn> <col1 col2 ...> |summarise|upload|all)\n";
+#    print STDERR "Run as: $0 (help|setup_greenstone|run_test <--modelOS windows|darwin|linux> <--justdiff|--nosvn> <col1 col2 ...> |summarise|upload|all)\n";
+    print STDERR "Run as: $0 (help|setup_greenstone|run_test|summarise|upload|all)\n";
+    print STDERR "where run_test can further take the following optional parameters:\n";
+    print STDERR "\t--modelOS (windows|darwin|linux)\n";
+    print STDERR "\t--justdiff|--nosvn\n";
+    print STDERR "\t<col1 col2 ...>\n";
 }
 
@@ -510 +530 @@
         if(-d "collect") {
             for my $col (@collections) {
-                &File::Path::remove_tree("collect$col") || die "Error could not delete collect: $!";            
+                if(-d "collect$col") {
+                &File::Path::remove_tree("collect$col") || die "Error could not delete collect: $!";
+                }           
             }   
         }
@@ -604 +626 @@
     print STDERR "$collection - Diffing:\n";
     my $diffcol_dir = &filename_concat($ENV{'TASK_HOME'},"diffcol");
-    $cmd = "diffcol.pl -output xml -verbosity 10 $collection"; # need to run with ./diffcol.pl if bash script
+    
+    # help diffcol to know on what os the model cols were generated
+    # and what os this test machine is (on which the test cols will be generated)
+    $cmd = "diffcol.pl -testos $test_os -modelos $model_os -output xml -verbosity 10 $collection"; # need to run with ./diffcol.pl if bash script
     &run_diff_script($cmd, $xml_fh, $diffcol_dir);