summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-03-06 01:45:46 +0000
committerGerrit Code Review <review@openstack.org>2014-03-06 01:45:46 +0000
commite533f2ac2c9faf18ff1c612722bf38ef37158c46 (patch)
tree91452b56736e2bfacdea9437c1111e37fc7cc996
parentfa06cba2e40e84133452673728ca208348bb64a6 (diff)
parent9df35c186f14d3b3b76a3946981ad6ec5cf9336f (diff)
Merge "Add a check target."
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index dda8f2c4..75b8a4a5 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,12 @@ undercloud-vm-ironic.yaml: undercloud-source.yaml undercloud-vm-ironic-source.ya
python ./tripleo_heat_merge/merge.py $^ > $@.tmp
mv $@.tmp $@
+check: test
+
test:
@bash test_merge.bash
clean:
rm -f $(generated_templates)
-.PHONY: clean overcloud.yaml
+.PHONY: clean overcloud.yaml check