From 1a957098e3135bc278dc75bf565a001b3210fbe4 Mon Sep 17 00:00:00 2001
From: frank <frank@cloud.com>
Date: Wed, 24 Aug 2011 15:02:17 -0700
Subject: [PATCH] add missing test stuff back

---
 cloud.spec    |  6 +++---
 wscript_build | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/cloud.spec b/cloud.spec
index a292d9786a9..395fe4c2d6b 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -602,9 +602,9 @@ fi
 %defattr(0644,root,root,0755)
 %attr(0755,root,root) %{_bindir}/%{name}-run-test
 %{_javadir}/%{name}-test.jar
-#%{_sharedstatedir}/%{name}/test/*
-#%{_libdir}/%{name}/test/*
-#%{_sysconfdir}/%{name}/test/*
+%{_sharedstatedir}/%{name}/test/*
+%{_libdir}/%{name}/test/*
+%{_sysconfdir}/%{name}/test/*
 
 #%if %{_premium}
 #
diff --git a/wscript_build b/wscript_build
index 686519cb7ff..80c6d22a2e7 100644
--- a/wscript_build
+++ b/wscript_build
@@ -358,6 +358,22 @@ def build_ovm():
 	start_path = bld.path.find_dir("ovm/scripts")
 	bld.substitute('**',"${AGENTLIBDIR}/scripts",chmod=0755, cwd=start_path)
 
+def build_test():
+	start_path = bld.path.find_dir("test/scripts")
+	bld.install_files('${LIBDIR}/${PACKAGE}/test', \
+		start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True), \
+		cwd=start_path,relative_trick=True)
+
+	start_path = bld.path.find_dir("test/metadata")
+	bld.install_files('${SHAREDSTATEDIR}/${PACKAGE}/test', \
+		start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True), \
+		cwd=start_path,relative_trick=True)
+
+	if not Options.options.PRESERVECONFIG:
+		start_path = bld.path.find_dir("test")
+		bld.install_files('${SYSCONFDIR}/${PACKAGE}/test','conf/*', cwd = start_path)
+	Utils.pprint ("GREEN", "Installed files of test/")
+
 
 
 # Get started to execute here
@@ -381,6 +397,7 @@ build_db_files ()
 build_plugins ()
 build_xml_api_description ()
 build_ovm ()
+build_test()
 
 # ====================== Magic! =========================================
 bld.use_the_magic()