From 419701d818c6ce4b9e1f6cc543c0b80729e9f525 Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Fri, 21 Mar 2008 17:24:56 +0000
Subject: [PATCH] new shared directory architecture
---
opends/tests/system-tests/phases/shared/functions/utils.xml | 0
opends/tests/system-tests/phases/shared/functions/ldap.xml | 0
opends/tests/system-tests/phases/shared/functions/staxcmd.xml | 0
opends/tests/system-tests/phases/shared/functions/signals.xml | 0
opends/tests/system-tests/phases/shared/functions/opendsadm.xml | 0
opends/tests/system-tests/phases/main_run.xml | 10 ++++++----
opends/tests/system-tests/phases/shared/functions/stafcmd.xml | 0
7 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/opends/tests/system-tests/phases/main_run.xml b/opends/tests/system-tests/phases/main_run.xml
index baa10a4..d9a81b8 100644
--- a/opends/tests/system-tests/phases/main_run.xml
+++ b/opends/tests/system-tests/phases/main_run.xml
@@ -110,6 +110,8 @@
ERR_NUM_SCHEDULER = ''
ERR_NUM_VERDICT = ''
ERR_NUM_TOTAL = 0
+
+ SHARED_FUNC_DIR = '%s/phases/shared/functions' % TESTS_DIR
</script>
@@ -124,13 +126,13 @@
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
file="'%s/phases/main_run_lib.xml' % (TESTS_DIR)"/>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/phases/shared/utils.xml' % (TESTS_DIR)"/>
+ file="'%s/utils.xml' % (SHARED_FUNC_DIR)"/>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/phases/shared/stafcmd.xml' % (TESTS_DIR)"/>
+ file="'%s/stafcmd.xml' % (SHARED_FUNC_DIR)"/>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/phases/shared/dsadm.xml' % (TESTS_DIR)"/>
+ file="'%s/opendsadm.xml' % (SHARED_FUNC_DIR)"/>
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/phases/shared/ldap.xml' % (TESTS_DIR)"/>
+ file="'%s/ldap.xml' % (SHARED_FUNC_DIR)"/>
<!-- TBD : should not have dependency with functional test suite -->
<import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
diff --git a/opends/tests/system-tests/phases/shared/ldap.xml b/opends/tests/system-tests/phases/shared/functions/ldap.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/ldap.xml
rename to opends/tests/system-tests/phases/shared/functions/ldap.xml
diff --git a/opends/tests/system-tests/phases/shared/dsadm.xml b/opends/tests/system-tests/phases/shared/functions/opendsadm.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/dsadm.xml
rename to opends/tests/system-tests/phases/shared/functions/opendsadm.xml
diff --git a/opends/tests/system-tests/phases/shared/signals.xml b/opends/tests/system-tests/phases/shared/functions/signals.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/signals.xml
rename to opends/tests/system-tests/phases/shared/functions/signals.xml
diff --git a/opends/tests/system-tests/phases/shared/stafcmd.xml b/opends/tests/system-tests/phases/shared/functions/stafcmd.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/stafcmd.xml
rename to opends/tests/system-tests/phases/shared/functions/stafcmd.xml
diff --git a/opends/tests/system-tests/phases/shared/staxcmd.xml b/opends/tests/system-tests/phases/shared/functions/staxcmd.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/staxcmd.xml
rename to opends/tests/system-tests/phases/shared/functions/staxcmd.xml
diff --git a/opends/tests/system-tests/phases/shared/utils.xml b/opends/tests/system-tests/phases/shared/functions/utils.xml
similarity index 100%
rename from opends/tests/system-tests/phases/shared/utils.xml
rename to opends/tests/system-tests/phases/shared/functions/utils.xml
--
Gitblit v1.10.0