diff options
| -rwxr-xr-x | run_unittests.py | 4 | ||||
| -rw-r--r-- | test cases/common/139 override options/meson.build | 2 | ||||
| -rw-r--r-- | test cases/unit/6 std override/meson.build | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/run_unittests.py b/run_unittests.py index 4d38b61..72c8457 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -1261,7 +1261,6 @@ class LinuxlikeTests(BasePlatformTests): # The chown failed nonfatally if we're not root self.assertEqual(0, statf.st_uid) - def test_cpp_std_override(self): testdir = os.path.join(self.unit_test_dir, '6 std override') self.init(testdir) @@ -1280,6 +1279,9 @@ class LinuxlikeTests(BasePlatformTests): self.assertNotIn('-std=c++03', c11_comp) self.assertNotIn('-std=c++03', plain_comp) self.assertNotIn('-std=c++11', plain_comp) + # Now werror + self.assertIn('-Werror', plain_comp) + self.assertNotIn('-Werror', c03_comp) class RewriterTests(unittest.TestCase): diff --git a/test cases/common/139 override options/meson.build b/test cases/common/139 override options/meson.build index 2eb554b..0db0513 100644 --- a/test cases/common/139 override options/meson.build +++ b/test cases/common/139 override options/meson.build @@ -4,3 +4,5 @@ project('option override', 'c', executable('mustunity', 'one.c', 'two.c') executable('notunity', 'three.c', 'four.c', override_options : ['unity=false']) + + diff --git a/test cases/unit/6 std override/meson.build b/test cases/unit/6 std override/meson.build index 35af1e8..ef2baac 100644 --- a/test cases/unit/6 std override/meson.build +++ b/test cases/unit/6 std override/meson.build @@ -1,8 +1,10 @@ project('cpp std override', 'cpp', - default_options : 'cpp_std=c++03') + default_options : ['cpp_std=c++03', + 'werror=true']) executable('plain', 'progp.cpp', override_options : 'cpp_std=none') -executable('v03', 'prog03.cpp') +executable('v03', 'prog03.cpp', + override_options : 'werror=false') executable('v11', 'prog11.cpp', override_options : 'cpp_std=c++11') |