From 7cad8a1bfb4cca03acafd30c07ff4c2cf47e65cb Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Sun, 27 Dec 2015 22:51:51 +0200
Subject: [PATCH] Fixed some tests for new stricter options and OSX.

---
 .../common/94 default options/meson.build     | 20 +++++++++++--------
 test cases/common/99 benchmark/meson.build    |  5 ++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/test cases/common/94 default options/meson.build b/test cases/common/94 default options/meson.build
index e9e885e60..629910651 100644
--- a/test cases/common/94 default options/meson.build	
+++ b/test cases/common/94 default options/meson.build	
@@ -2,7 +2,6 @@ project('default options', 'cpp', 'c', default_options : [
   'buildtype=debugoptimized',
   'cpp_std=c++03',
   'cpp_eh=none',
-  'c_std=-crashcompiler',
   ])
 
 cpp = meson.get_compiler('cpp')
@@ -15,11 +14,16 @@ else
   assert(get_option('cpp_std') == 'c++03', 'C++ std value wrong.')
 endif
 
-# Verify that project args are not used when told not to.
-# MSVC plain C does not have a simple arg to test so skip it.
-if cpp.get_id() != 'msvc'
-  cc = meson.get_compiler('c')
-  assert(not cc.compiles('int foobar;'), 'Default arg not used in test.')
-  assert(cc.compiles('int foobar;', no_builtin_args : true), 'No_builtin did not disable builtins.')
-endif
+# FIXME. Since we no longer accept invalid options to c_std etc,
+# there is no simple way to test this. Gcc does not seem to expose
+# the C std used in a preprocessor token so we can't check for it.
+# Think of a way to fix this.
+#
+# # Verify that project args are not used when told not to.
+# # MSVC plain C does not have a simple arg to test so skip it.
+# if cpp.get_id() != 'msvc'
+#   cc = meson.get_compiler('c')
+#   assert(not cc.compiles('int foobar;'), 'Default arg not used in test.')
+#   assert(cc.compiles('int foobar;', no_builtin_args : true), 'No_builtin did not disable builtins.')
+# endif
 
diff --git a/test cases/common/99 benchmark/meson.build b/test cases/common/99 benchmark/meson.build
index bd4340bca..9d583d2e1 100644
--- a/test cases/common/99 benchmark/meson.build	
+++ b/test cases/common/99 benchmark/meson.build	
@@ -1,5 +1,4 @@
-project('benchmark', 'c',
-  default_options : ['c_std=gnu99'])
+project('benchmark', 'c')
 
-delayer = executable('delayer', 'delayer.c')
+delayer = executable('delayer', 'delayer.c', c_args : '-D_GNU_SOURCE')
 benchmark('delayer', delayer)