aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-01-31 15:00:10 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-01-31 15:43:04 +0100
commitc64d80cf2fa94c458e4fc528723bb7ed11daa3a0 (patch)
tree323783daca80785a9f49c747c67a55208b5b64d0
parent8bb942ef25c40014ca952e26fc70f927ab1694ff (diff)
downloadmeson-c64d80cf2fa94c458e4fc528723bb7ed11daa3a0.zip
meson-c64d80cf2fa94c458e4fc528723bb7ed11daa3a0.tar.gz
meson-c64d80cf2fa94c458e4fc528723bb7ed11daa3a0.tar.bz2
Renamed operation test -> info
-rw-r--r--mesonbuild/rewriter.py4
-rw-r--r--test cases/rewrite/1 basic/addSrc.json18
-rw-r--r--test cases/rewrite/1 basic/info.json18
-rw-r--r--test cases/rewrite/1 basic/rmSrc.json18
-rw-r--r--test cases/rewrite/2 subdirs/addSrc.json2
-rw-r--r--test cases/rewrite/2 subdirs/info.json2
6 files changed, 31 insertions, 31 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py
index aea185b..cad6a5e 100644
--- a/mesonbuild/rewriter.py
+++ b/mesonbuild/rewriter.py
@@ -251,7 +251,7 @@ rewriter_keys = {
},
'target': {
'target': (str, None, None),
- 'operation': (str, None, ['src_add', 'src_rm', 'test']),
+ 'operation': (str, None, ['src_add', 'src_rm', 'info']),
'sources': (list, [], None),
'debug': (bool, False, None)
}
@@ -493,7 +493,7 @@ class Rewriter:
if root not in self.modefied_nodes:
self.modefied_nodes += [root]
- elif cmd['operation'] == 'test':
+ elif cmd['operation'] == 'info':
# List all sources in the target
src_list = []
for i in target['sources']:
diff --git a/test cases/rewrite/1 basic/addSrc.json b/test cases/rewrite/1 basic/addSrc.json
index 1a504bf..9d6dafd 100644
--- a/test cases/rewrite/1 basic/addSrc.json
+++ b/test cases/rewrite/1 basic/addSrc.json
@@ -44,46 +44,46 @@
{
"type": "target",
"target": "trivialprog1",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog2",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog3",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog4",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog5",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog6",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog7",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog8",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog9",
- "operation": "test"
+ "operation": "info"
}
]
diff --git a/test cases/rewrite/1 basic/info.json b/test cases/rewrite/1 basic/info.json
index 9271185..c791c8f 100644
--- a/test cases/rewrite/1 basic/info.json
+++ b/test cases/rewrite/1 basic/info.json
@@ -2,46 +2,46 @@
{
"type": "target",
"target": "trivialprog1",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "exe2",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog3",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "exe4",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog5",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "exe6",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog7",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "exe8",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog9",
- "operation": "test"
+ "operation": "info"
}
]
diff --git a/test cases/rewrite/1 basic/rmSrc.json b/test cases/rewrite/1 basic/rmSrc.json
index a8559a5..86880a9 100644
--- a/test cases/rewrite/1 basic/rmSrc.json
+++ b/test cases/rewrite/1 basic/rmSrc.json
@@ -38,46 +38,46 @@
{
"type": "target",
"target": "trivialprog1",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog2",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog3",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog4",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog5",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog6",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog7",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog8",
- "operation": "test"
+ "operation": "info"
},
{
"type": "target",
"target": "trivialprog9",
- "operation": "test"
+ "operation": "info"
}
]
diff --git a/test cases/rewrite/2 subdirs/addSrc.json b/test cases/rewrite/2 subdirs/addSrc.json
index 017476c..1a5c13e 100644
--- a/test cases/rewrite/2 subdirs/addSrc.json
+++ b/test cases/rewrite/2 subdirs/addSrc.json
@@ -8,6 +8,6 @@
{
"type": "target",
"target": "something",
- "operation": "test"
+ "operation": "info"
}
]
diff --git a/test cases/rewrite/2 subdirs/info.json b/test cases/rewrite/2 subdirs/info.json
index 0173333..7075fa8 100644
--- a/test cases/rewrite/2 subdirs/info.json
+++ b/test cases/rewrite/2 subdirs/info.json
@@ -2,6 +2,6 @@
{
"type": "target",
"target": "something",
- "operation": "test"
+ "operation": "info"
}
]