diff options
| -rw-r--r-- | misc/ninja_syntax.py | 2 | ||||
| -rwxr-xr-x | misc/ninja_test.py | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/misc/ninja_syntax.py b/misc/ninja_syntax.py index b73a002..8f3e309 100644 --- a/misc/ninja_syntax.py +++ b/misc/ninja_syntax.py @@ -66,7 +66,7 @@ class Writer(object): ' '.join(all_inputs))) if variables: - for key, val in variables: + for key, val in variables.iteritems(): self.variable(key, val, indent=1) return outputs diff --git a/misc/ninja_test.py b/misc/ninja_test.py index 65dbec6..7059ae7 100755 --- a/misc/ninja_test.py +++ b/misc/ninja_test.py @@ -111,5 +111,18 @@ foo = a$$ $ ''', self.out.getvalue()) +class TestBuild(unittest.TestCase): + def setUp(self): + self.out = StringIO() + self.n = ninja_syntax.Writer(self.out) + + def test_variables(self): + self.n.build('out', 'cc', 'in', variables={'name': 'value'}) + self.assertEqual('''\ +build out: cc in + name = value +''', + self.out.getvalue()) + if __name__ == '__main__': unittest.main() |