aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-02-16 20:34:30 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-02-26 09:34:58 +0100
commit16b6b2d41196367084b9a7ed3392ca1d427e6bd7 (patch)
treefb745f55f46e6498eca0c4338026af2d95a00a3d
parent9e247cb52e65dd62450990fbb9a2c3935e8f11ab (diff)
downloadmeson-16b6b2d41196367084b9a7ed3392ca1d427e6bd7.zip
meson-16b6b2d41196367084b9a7ed3392ca1d427e6bd7.tar.gz
meson-16b6b2d41196367084b9a7ed3392ca1d427e6bd7.tar.bz2
Use c++14 instead of c++17 in the tests
-rwxr-xr-xrun_unittests.py2
-rw-r--r--test cases/rewrite/3 kwargs/defopts_delete.json2
-rw-r--r--test cases/rewrite/3 kwargs/defopts_set.json2
-rw-r--r--test cases/rewrite/3 kwargs/remove_regex.json2
4 files changed, 4 insertions, 4 deletions
diff --git a/run_unittests.py b/run_unittests.py
index 272a38b..e6df87a 100755
--- a/run_unittests.py
+++ b/run_unittests.py
@@ -5348,7 +5348,7 @@ class RewriterTests(BasePlatformTests):
out = self.extract_test_data(out)
expected = {
'kwargs': {
- 'project#': {'version': '0.0.1', 'default_options': ['cpp_std=c++17', 'debug=true']},
+ 'project#': {'version': '0.0.1', 'default_options': ['cpp_std=c++14', 'debug=true']},
'target#tgt1': {'build_by_default': True},
'dependency#dep1': {'required': False}
}
diff --git a/test cases/rewrite/3 kwargs/defopts_delete.json b/test cases/rewrite/3 kwargs/defopts_delete.json
index 0ed6d92..06232dd 100644
--- a/test cases/rewrite/3 kwargs/defopts_delete.json
+++ b/test cases/rewrite/3 kwargs/defopts_delete.json
@@ -5,7 +5,7 @@
"id": "",
"operation": "set",
"kwargs": {
- "default_options": ["cpp_std=c++17", "buildtype=release", "debug=true"]
+ "default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"]
}
},
{
diff --git a/test cases/rewrite/3 kwargs/defopts_set.json b/test cases/rewrite/3 kwargs/defopts_set.json
index ce67ac1..f8f855f 100644
--- a/test cases/rewrite/3 kwargs/defopts_set.json
+++ b/test cases/rewrite/3 kwargs/defopts_set.json
@@ -3,7 +3,7 @@
"type": "default_options",
"operation": "set",
"options": {
- "cpp_std": "c++17"
+ "cpp_std": "c++14"
}
},
{
diff --git a/test cases/rewrite/3 kwargs/remove_regex.json b/test cases/rewrite/3 kwargs/remove_regex.json
index a938ae0..fcb04eb 100644
--- a/test cases/rewrite/3 kwargs/remove_regex.json
+++ b/test cases/rewrite/3 kwargs/remove_regex.json
@@ -5,7 +5,7 @@
"id": "",
"operation": "set",
"kwargs": {
- "default_options": ["cpp_std=c++17", "buildtype=release", "debug=true"]
+ "default_options": ["cpp_std=c++14", "buildtype=release", "debug=true"]
}
},
{