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

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/diffcol

Files:

• diffcol.pl (modified) (6 diffs)
• gdbdiff.pm (modified) (2 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) {