From 0dbf2810a0ee78658c35e61dc447c5f968226cb9 Mon Sep 17 00:00:00 2001
From: Clint Byrum <clint@fewbar.com>
Date: Wed, 18 Sep 2013 18:08:08 -0700
Subject: Add functional tests and examples for merge

merge.py is undocumented and untested, which is undesirable, as it does
not seem to be going away any time soon.

Change-Id: I7e4870e58a32c567e5947b9a48893b8210ad4d65
---
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ad93ff03..534cd0f0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,6 @@ notcompute.yaml: $(NOTCOMPUTE)
 overcloud.yaml: overcloud-source.yaml nova-compute-instance.yaml
 	python merge.py $< > $@.tmp
 	mv $@.tmp $@
+
+test:
+	@bash test_merge.bash
-- 
cgit 1.2.3-korg