svn merge -r5333:5417 https://opends.dev.java.net/svn/opends/branches/b2.0

matthew_swift

05.04.2009 67405dde9ba213331dab1fc46cb18c485070fd5b

 opends/tests/staf-tests/shared/ant/build.xml

@@ -184,9 +184,9 @@
      </then>
      <else>
        <if>
          <available file="${basedir}/tests-${local.hostname}.properties"/>
          <available file="${basedir}/${tests.type}-${local.hostname}.properties"/>
          <then>
            <var file="${basedir}/tests-${local.hostname}.properties"/>
            <var file="${basedir}/${tests.type}-${local.hostname}.properties"/>
          </then>
        </if>
      </else>
@@ -203,6 +203,30 @@
      </else>
    </if>

    <!-- Set value for tests.run.dir variable -->
    <if>
      <not>
        <equals arg1="${logs.dir}" arg2="${basedir}/temp/logs"/>
      </not>
      <then>
        <var name="tests.run.dir" value="${logs.dir}/${tests.type}/run"/>
      </then>
    </if>

    <!-- Set value for email.subject variable -->
    <if>
      <equals arg1="${tests.type}" arg2="functional-tests"/>
      <then>
        <property name="email.subject"
        value="Functional tests: ${opends.name} ${remote.hostname} ${tests.os.string} ${tests.jvm.string}"/>
      </then>
      <else>
        <property name="email.subject"
        value="Stress tests: ${opends.name} ${remote.hostname} ${tests.os.string} ${tests.jvm.string}"/>
      </else>
    </if>


    <!-- Set value for staf.archive and staf.lib.dir variables -->
    <if>
      <equals arg1="${os.family}" arg2="windows"/>