Changeset 36850

Timestamp:

2022-10-21T17:29:52+13:00 (18 months ago)

Author:

anupama

Message:

Skip tersting windows-only model collection Word-PDF-Enhanced if testing on Linux. If testing on Windows, the model_os setting to be used for diffcol (so that directory separators/slashes are equalised) for this windows-only collection should be Windows, because the model-collect for Word-PDF-Enhanced ought to have been built on Windows.

File:

• other-projects/nightly-tasks/diffcol/trunk/task.pl (modified) (2 diffs)

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

@@ -827 +827 @@
     
     for my $collection (@collections) {
+    
+        my $model_os_for_collection = $model_os;        
+        if($collection =~ m/Word-PDF-Enhanced/) {
+            print STDERR "**** Found windows-scripting collection for Windows only: collection Word-PDF-Enhanced\n";
+            if($test_os ne "windows") {
+                print STDERR "**** Can't test windows-specific collection on non-windows test OS: $test_os. Skipping this collection.\n";               
+                next;
+            } else {
+                $model_os_for_collection = "windows";
+                print STDERR "**** This is a windows-specific collection, its model collection should have been built on windows.\n";
+                print STDERR "**** Thus switching the OS setting for this model collection to: $model_os_for_collection.\n";
+            }
+        }
+    
         chdir($collect_parent); # for GS3 too, ensure we're first in the collect folder for each collection
 
@@ -891 +905 @@
     # and what os this test machine is (on which the test cols will be generated)
     my $debug_state = $debugging ? "-debug" : "";
-    $cmd = "diffcol.pl -testos $test_os -modelos $model_os -output xml -verbosity 10 $debug_state $collection"; # need to run with ./diffcol.pl if bash script
+    $cmd = "diffcol.pl -testos $test_os -modelos $model_os_for_collection -output xml -verbosity 10 $debug_state $collection"; # need to run with ./diffcol.pl if bash script
 
     #print STDERR "Running diffcol cmd: $cmd\n";