From ca0deb828b396e78668b3daf88251aa334c6aeda Mon Sep 17 00:00:00 2001
From: andrug <andrug@localhost>
Date: Mon, 28 Apr 2008 13:50:53 +0000
Subject: [PATCH] move pre-configuration phase before generation and import of ldif data
---
opendj-sdk/opends/tests/system-tests/phases/main_run.xml | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
index e75db42..ba173bb 100644
--- a/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
+++ b/opendj-sdk/opends/tests/system-tests/phases/main_run.xml
@@ -234,22 +234,6 @@
</if>
- <!-- ============ GENERATE LDIF & IMPORT LDIF ================== -->
- <if expr="runGenerateLdif == 'true' and ERR_NUM_TOTAL == 0">
- <sequence>
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/phases/generateLdif/generateLdif.xml' % (TESTS_DIR)"/>
- <call function="'generateLdif'">
- { 'suffix' : suffix }
- </call>
- <script>
- ERR_NUM_GEN_LDIF = ERR_NUM[0]
- ERR_NUM_TOTAL = ERR_NUM_TOTAL + ERR_NUM[0]
- </script>
- </sequence>
- </if>
-
-
<!-- ============ PRE-CONFIGURATION ============================ -->
<if expr="runPreConfiguration == 'true' and ERR_NUM_TOTAL == 0">
<sequence>
@@ -290,6 +274,22 @@
</if>
+ <!-- ============ GENERATE LDIF & IMPORT LDIF ================== -->
+ <if expr="runGenerateLdif == 'true' and ERR_NUM_TOTAL == 0">
+ <sequence>
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/phases/generateLdif/generateLdif.xml' % (TESTS_DIR)"/>
+ <call function="'generateLdif'">
+ { 'suffix' : suffix }
+ </call>
+ <script>
+ ERR_NUM_GEN_LDIF = ERR_NUM[0]
+ ERR_NUM_TOTAL = ERR_NUM_TOTAL + ERR_NUM[0]
+ </script>
+ </sequence>
+ </if>
+
+
<!-- ============ CONFIGURATION =============================== -->
<if expr="runConfiguration == 'true' and ERR_NUM_TOTAL == 0">
<sequence>
--
Gitblit v1.10.0