Fix ICC on macOS

3 files changed, 10 insertions, 4 deletions

diff --git a/test cases/common/204 function attributes/meson.build b/test cases/common/204 function attributes/meson.build
index bc049d7d0..e46533f8b 100644
--- a/test cases/common/204 function attributes/meson.build
+++ b/test cases/common/204 function attributes/meson.build
@@ -50,9 +50,15 @@ attributes = [
   'used',
   'warn_unused_result',
   'weak',
-  'weakref',
 ]
 
+if c.get_id() != 'intel'
+  # not supported by icc as of 19.0.0
+  attributes += 'weakref'
+endif
+
+expected_result = c.get_id() != 'msvc'
+
 # These are unsupported on darwin with apple clang 9.1.0
 if host_machine.system() != 'darwin'
   attributes += 'alias'
diff --git a/test cases/unit/6 std override/meson.build b/test cases/unit/6 std override/meson.build
index ef2baacd5..0eac75222 100644
--- a/test cases/unit/6 std override/meson.build
+++ b/test cases/unit/6 std override/meson.build
@@ -1,10 +1,10 @@
 project('cpp std override', 'cpp',
-  default_options : ['cpp_std=c++03',
+  default_options : ['cpp_std=c++98',
                      'werror=true'])
 
 executable('plain', 'progp.cpp',
   override_options : 'cpp_std=none')
-executable('v03', 'prog03.cpp',
+executable('v98', 'prog98.cpp',
   override_options : 'werror=false')
 executable('v11', 'prog11.cpp',
   override_options : 'cpp_std=c++11')
diff --git a/test cases/unit/6 std override/prog03.cpp b/test cases/unit/6 std override/prog98.cpp
index d30abc95c..67c326d29 100644
--- a/test cases/unit/6 std override/prog03.cpp
+++ b/test cases/unit/6 std override/prog98.cpp
@@ -1,6 +1,6 @@
 #include<iostream>
 
 int main(int argc, char **argv) {
-    std::cout << "I am a c++03 test program.\n";
+    std::cout << "I am a c++98 test program.\n";
     return 0;
 }