Fix problems with path-filtering in regression suite on Windows. (#19223

) (#19224)

Added logic to handle cases where there are extra path-separator escapes when filtering paths in text to substitute VISIT_TOP_DIR.

Also reverted a change in Variant.C where unix-style paths were converted to Windows-style in 'EscapeQuotedString'.

src/common/state/Variant.C

@@ -2980,6 +2980,10 @@ Variant::TokenizeQuotedString(const string &val,stringVector &tokens)
 //    Kathleen Biagas, Fri Dec 1 2023
 //    If on Windows, also escape path separators and convert unix-style.
 //
+//    Kathleen Biagas, Wed Jan 3 2024
+//    Revert conversion of unix-style path separator on Windows, it caused
+//    problems for 'dir/var' strings that weren't file-paths. 
+//
 // ****************************************************************************
 string
 Variant::EscapeQuotedString(const string &val)
@@ -2999,11 +3003,6 @@ Variant::EscapeQuotedString(const string &val)
             res.push_back('\\');
             res.push_back('\\');
         }
-        else if(val[i] == '/')
-        {
-            res.push_back('\\');
-            res.push_back('\\');
-        }
 #endif
         else
         {

src/test/py_src/visit_test_main.py

@@ -1681,6 +1681,10 @@ def ProcessDiffImage(case_name, baseimg, testimg, diffimg):
 #
 #   Mark C. Miller, Fri Sep 11 19:55:17 PDT 2020
 #   Added numdifftol arg
+#
+#   Kathleen Biagas, Tue Jan 2, 2024
+#   Handle cases where there are extra path-separator escapes on Windows.
+#
 # ----------------------------------------------------------------------------
 
 def FilterTestText(inText, baseText, numdifftol):
@@ -1691,10 +1695,16 @@ def FilterTestText(inText, baseText, numdifftol):
     # We have to filter out the absolute path information we might see in
     # this string. runtest passes the value for visitTopDir here.
     #
+
+    # handle cases where there are extra path-separator escapes
+    if platform.system() == "Windows":
+        inText = inText.replace("\\\\", "\\")
+
     inText = inText.replace(TestEnv.params["run_dir"], "VISIT_TOP_DIR/test")
     inText = inText.replace(out_path(), "VISIT_TOP_DIR/test")
     inText = inText.replace(test_root_path(), "VISIT_TOP_DIR/test")
     inText = inText.replace(data_path(), "VISIT_TOP_DIR/data")
+
     #
     # Only consider doing any string substitution if numerical diff threshold
     # is non-zero