[Libreoffice-commits] core.git: compilerplugins/clang

[Stephan Bergmann]

 compilerplugins/clang/test/convertuintptr.cxx |    4 ++--
 compilerplugins/clang/test/droplong.cxx       |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 4eaaa812cebe7c8ec729616e35794dfee64c338a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Aug 21 11:11:26 2017 +0200

    Adapt tests to Windows
    
    Change-Id: I8d33234196060f96ad47c9d0fead4f31218f8bdd

diff --git a/compilerplugins/clang/test/convertuintptr.cxx b/compilerplugins/clang/test/convertuintptr.cxx
index 8789394c541f..f1c484d8f730 100644
--- a/compilerplugins/clang/test/convertuintptr.cxx
+++ b/compilerplugins/clang/test/convertuintptr.cxx
@@ -12,8 +12,8 @@
 int main()
 {
     sal_uIntPtr x = 1;
-    sal_uInt32 y = x; // expected-error {{cast from 'sal_uIntPtr' (aka 'unsigned long') to 'sal_uInt32' (aka 'unsigned int') [loplugin:convertuintptr]}}
-    y = x; // expected-error {{cast from 'sal_uIntPtr' (aka 'unsigned long') to 'sal_uInt32' (aka 'unsigned int') [loplugin:convertuintptr]}}
+    sal_uInt32 y = x; // expected-error-re {{cast from 'sal_uIntPtr' (aka 'unsigned {{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') [loplugin:convertuintptr]}}
+    y = x; // expected-error-re {{cast from 'sal_uIntPtr' (aka 'unsigned {{.+}}') to 'sal_uInt32' (aka 'unsigned {{.+}}') [loplugin:convertuintptr]}}
     (void)y;
 }
 
diff --git a/compilerplugins/clang/test/droplong.cxx b/compilerplugins/clang/test/droplong.cxx
index d90c31945cd5..6b9271a20103 100644
--- a/compilerplugins/clang/test/droplong.cxx
+++ b/compilerplugins/clang/test/droplong.cxx
@@ -17,10 +17,10 @@ int main()
     (void)tmp;
     tmp = x + y; // expected-error {{rather replace 'long' with 'int' [loplugin:droplong]}}
 
-    sal_uLong tmp1 = x + y; // expected-error {{rather replace 'sal_uLong' (aka 'unsigned long') with 'int' [loplugin:droplong]}}
+    sal_uLong tmp1 = x + y; // expected-error-re {{rather replace 'sal_uLong' (aka 'unsigned {{.+}}') with 'int' [loplugin:droplong]}}
     (void)tmp1;
 
-    int tmp2 = (sal_uLong)1; // expected-error {{sal_uLong cast from 'sal_uLong' (aka 'unsigned long') [loplugin:droplong]}}
+    int tmp2 = (sal_uLong)1; // expected-error-re {{sal_uLong cast from 'sal_uLong' (aka 'unsigned {{.+}}') [loplugin:droplong]}}
     tmp2 = (long)1; // expected-error {{long cast from 'long' [loplugin:droplong]}}
 }