Fix test_precompiled_headers after recent LLVM change. NFC

This was is sensitive the precise output of `clang --print-stats`. This
change makes it a little less sensitive so that it passed both before
and after recent llvm changes.

Author: sbc100

test/common.py

@@ -1061,11 +1061,6 @@ def assertIdentical(self, values, y, msg=None,
       fail_message += '\n' + msg
     self.fail(fail_message)
 
-  def assertTextDataContained(self, text1, text2):
-    text1 = text1.replace('\r\n', '\n')
-    text2 = text2.replace('\r\n', '\n')
-    return self.assertContained(text1, text2)
-
   def assertFileContents(self, filename, contents):
     if EMTEST_VERBOSE:
       print(f'Comparing results contents of file: {filename}')
@@ -1108,13 +1103,16 @@ def assertContained(self, values, string, additional_info='', regex=False):
         additional_info,
       ))
 
-  def assertNotContained(self, value, string):
+  def assertNotContained(self, value, string, regex=False):
     if callable(value):
       value = value() # lazy loading
     if callable(string):
       string = string()
-    if value in string:
-      self.fail("Expected to NOT find '%s' in '%s'" % (limit_size(value), limit_size(string)))
+    if regex:
+      self.assertFalse(re.search(value, string, re.DOTALL), 'Expected regex "%s" NOT to match on:\n%s' % (value, limit_size(string)))
+    else:
+      if value in string:
+        self.fail("Expected to NOT find '%s' in '%s'" % (limit_size(value), limit_size(string)))
 
   def assertContainedIf(self, value, string, condition):
     if condition:

test/test_other.py

@@ -4523,6 +4523,7 @@ def test_precompiled_headers_warnings(self):
     'gch': ['gch'],
     'pch': ['pch'],
   })
+  @crossplatform
   def test_precompiled_headers(self, suffix):
     create_file('header.h', '#define X 5\n')
     self.run_process([EMCC, '-xc++-header', 'header.h', '-c'])
@@ -4545,11 +4546,11 @@ def test_precompiled_headers(self, suffix):
 
     # also verify that the gch is actually used
     err = self.run_process([EMXX, 'src.cpp', '-include', 'header.h', '-Xclang', '-print-stats'], stderr=PIPE).stderr
-    self.assertTextDataContained('*** PCH/Modules Loaded:\nModule: header.h.pch', err)
+    self.assertContained(r'PCH/Modules Loaded:\nModule: .*header.h.pch', err.replace('\r\n', '\n'), regex=True)
     # and sanity check it is not mentioned when not
     delete_file('header.h.' + suffix)
     err = self.run_process([EMXX, 'src.cpp', '-include', 'header.h', '-Xclang', '-print-stats'], stderr=PIPE).stderr
-    self.assertNotContained('*** PCH/Modules Loaded:\nModule: header.h.' + suffix, err.replace('\r\n', '\n'))
+    self.assertNotContained(r'PCH/Modules Loaded:', err, regex=True)
 
     # with specified target via -o
     delete_file('header.h.' + suffix)