run next phase only if previous phase succeded

andrug

07.29.2008 0eb99ab467b9f3daa6acb65afdc865326f1f0a09

run next phase only if previous phase succeded

 opends/tests/system-tests/phases/main_run.xml

@@ -232,94 +232,105 @@
      
      <!-- ============ GENERATE LDIF & IMPORT LDIF  ================== -->
      <if expr="runGenerateLdif == 'true'">
        <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 expr="ERR_NUM_INSTALL == '' or ERR_NUM_INSTALL == 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>
      </if>
      
      
      <!-- ============ PRE-CONFIGURATION ============================ -->
      <if expr="runPreConfiguration == 'true'">
        <sequence>
          <call function="'isFile'">
          {
            'location' : STAXServiceMachine,
            'fileName' : preConfigurationFile
          }
          </call>
          <if expr="STAXResult == TRUE">
            <sequence>
              <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
                      file="'%s' % preConfigurationFile"/>
              <call function="'preConfiguration'">
              { 
                'instances' : instances,
                'suffix'    : suffix,
                'scheduler' : scheduler
              }
              </call>
              <script>
                ERR_NUM_PRE_CONFIGURATION = ERR_NUM[0]
                ERR_NUM_TOTAL             = ERR_NUM_TOTAL + ERR_NUM[0]
              </script>
            </sequence>
          </if>
        </sequence>
        <if expr="ERR_NUM_GEN_LDIF == '' or ERR_NUM_GEN_LDIF == 0">
          <sequence>
            <call function="'isFile'">
            {
              'location' : STAXServiceMachine,
              'fileName' : preConfigurationFile
            }
            </call>
            <if expr="STAXResult == TRUE">
              <sequence>
                <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
                        file="'%s' % preConfigurationFile"/>
                <call function="'preConfiguration'">
                { 
                  'instances' : instances,
                  'suffix'    : suffix,
                  'scheduler' : scheduler
                }
                </call>
                <script>
                  ERR_NUM_PRE_CONFIGURATION = ERR_NUM[0]
                  ERR_NUM_TOTAL             = ERR_NUM_TOTAL + ERR_NUM[0]
                </script>
              </sequence>
            </if>
          </sequence>
        </if>
      </if>
      
      
      <!-- ============ CONFIGURATION  =============================== -->
      <if expr="runConfiguration == 'true'">
        <sequence>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/phases/configuration/configuration.xml' % (TESTS_DIR)"/>
          <call function="'configuration'">
            {
              'instances' : instances ,
              'suffix'    : suffix
            }
          </call>
          <script>
            ERR_NUM_CONFIGURATION = ERR_NUM[0]
            ERR_NUM_TOTAL         = ERR_NUM_TOTAL + ERR_NUM[0]
          </script>
        </sequence>
        <if expr="ERR_NUM_PRE_CONFIGURATION == '' or
                  ERR_NUM_PRE_CONFIGURATION == 0">
          <sequence>
            <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
              file="'%s/phases/configuration/configuration.xml' % TESTS_DIR"/>
            <call function="'configuration'">
              {
                'instances' : instances ,
                'suffix'    : suffix
              }
            </call>
            <script>
              ERR_NUM_CONFIGURATION = ERR_NUM[0]
              ERR_NUM_TOTAL         = ERR_NUM_TOTAL + ERR_NUM[0]
            </script>
          </sequence>
        </if>
      </if>
      
      
      <!-- ============ POST-CONFIGURATION =========================== -->
      <if expr="runPostConfiguration == 'true'">
        <sequence>
          <call function="'isFile'">
          {
            'location' : STAXServiceMachine,
            'fileName' : postConfigurationFile
          }
          </call>
          <if expr="STAXResult == TRUE">
            <sequence>
              <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
                      file="'%s' % postConfigurationFile"/>
              <call function="'postConfiguration'">
              { 
                'instances' : instances,
                'suffix'    : suffix,
                'scheduler' : scheduler
              }
              </call>
              <script>
                ERR_NUM_POST_CONFIGURATION = ERR_NUM[0]
                ERR_NUM_TOTAL              = ERR_NUM_TOTAL + ERR_NUM[0]
              </script>
            </sequence>
          </if>
        </sequence>
        <if expr="ERR_NUM_CONFIGURATION == '' or ERR_NUM_CONFIGURATION == 0">
          <sequence>
            <call function="'isFile'">
            {
              'location' : STAXServiceMachine,
              'fileName' : postConfigurationFile
            }
            </call>
            <if expr="STAXResult == TRUE">
              <sequence>
                <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
                        file="'%s' % postConfigurationFile"/>
                <call function="'postConfiguration'">
                { 
                  'instances' : instances,
                  'suffix'    : suffix,
                  'scheduler' : scheduler
                }
                </call>
                <script>
                  ERR_NUM_POST_CONFIGURATION = ERR_NUM[0]
                  ERR_NUM_TOTAL              = ERR_NUM_TOTAL + ERR_NUM[0]
                </script>
              </sequence>
            </if>
          </sequence>
        </if>
      </if>
      
      
@@ -329,22 +340,25 @@
      
      <!-- ============ scheduler ==================================== -->
      <if expr="runScheduler == 'true'">
        <sequence>
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/phases/scheduler/scheduler.xml' % (TESTS_DIR)"/>
          <call function="'scheduler'">
            {
              'instances' : instances,
              'suffix'    : suffix,
              'scheduler' : scheduler,
              'scenario'  : scenario
            }
          </call>
          <script>
            ERR_NUM_SCHEDULER = ERR_NUM[0]
            ERR_NUM_TOTAL     = ERR_NUM_TOTAL + ERR_NUM[0]
          </script>
        </sequence>
        <if expr="ERR_NUM_POST_CONFIGURATION == '' or 
                  ERR_NUM_POST_CONFIGURATION == 0">
          <sequence>
            <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
              file="'%s/phases/scheduler/scheduler.xml' % (TESTS_DIR)"/>
            <call function="'scheduler'">
              {
                'instances' : instances,
                'suffix'    : suffix,
                'scheduler' : scheduler,
                'scenario'  : scenario
              }
            </call>
            <script>
              ERR_NUM_SCHEDULER = ERR_NUM[0]
              ERR_NUM_TOTAL     = ERR_NUM_TOTAL + ERR_NUM[0]
            </script>
          </sequence>
        </if>
      </if>