Merge branch 'master' of git.carlh.net:git/cdist
authorCarl Hetherington <cth@carlh.net>
Sun, 2 Jul 2017 23:13:08 +0000 (00:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 2 Jul 2017 23:13:08 +0000 (00:13 +0100)
1  2 
cdist

diff --cc cdist
index 38d7810dcc415c9f274cd5c88bb44bc700d3fff7,0018027ebbd2618f33f39df24313234bdef4190a..96fefdeadf10f37ad5b7523acb58eaa94d247d50
--- 1/cdist
--- 2/cdist
+++ b/cdist
@@@ -329,13 -344,14 +344,14 @@@ class Target(object)
      def package(self, project, checkout):
          tree = globals.trees.get(project, checkout, self)
          tree.build_dependencies()
 -        tree.build(tree)
 +        tree.build()
          return tree.call('package', tree.version), tree.git_commit
  
-     def test(self, tree):
+     def test(self, tree, test):
+         """test is the test case to run, or None"""
          tree.build_dependencies()
          tree.build()
-         return tree.call('test')
+         return tree.call('test', test)
  
      def set(self, a, b):
          self.variables[a] = b