harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r585092 - in /harmony/enhanced/buildtest/branches/2.0/tests/eut: ./ config/ summary-reporter/src/org/apache/harmony/eut/reporter/
Date Tue, 16 Oct 2007 09:47:26 GMT
Author: smishura
Date: Tue Oct 16 02:47:18 2007
New Revision: 585092

URL: http://svn.apache.org/viewvc?rev=585092&view=rev
Log:
Apply patch from HARMONY-4936:
[buildtest][eut] move EFL to subdirectory

Added:
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.2.efl
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.2.linux.gtk.x86.efl
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.linux.gtk.x86.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.2.suites.properties
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.suites.properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.efl
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.linux.gtk.x86.efl
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.linux.gtk.x86.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.linux.gtk.x86_64.efl 
 (with props)
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.suites.properties
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.suites.properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.win32.win32.x86.efl
      - copied unchanged from r585091, harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.win32.win32.x86.efl
Removed:
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.linux.gtk.x86.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.2.suites.properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.linux.gtk.x86.efl
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.suites.properties
    harmony/enhanced/buildtest/branches/2.0/tests/eut/eut3.3.win32.win32.x86.efl
Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
    harmony/enhanced/buildtest/branches/2.0/tests/eut/summary-reporter/src/org/apache/harmony/eut/reporter/EUTReporter.java

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml?rev=585092&r1=585091&r2=585092&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml Tue Oct 16 02:47:18 2007
@@ -349,7 +349,7 @@
         <delete file="${results.dir}/eut.efl"/>
         <touch file="${results.dir}/eut.efl"/>
         <concat destfile="${results.dir}/eut.efl">
-            <filelist dir="${basedir}" files="
+            <filelist dir="${basedir}/config" files="
                 eut${eclipse.buildid}.efl
                 eut${eclipse.buildid}.${os.eclipse.notation}.efl
                 eut${eclipse.buildid}.${os.eclipse.notation}.${ws}.efl

Added: harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.linux.gtk.x86_64.efl
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.linux.gtk.x86_64.efl?rev=585092&view=auto
==============================================================================
    (empty)

Propchange: harmony/enhanced/buildtest/branches/2.0/tests/eut/config/eut3.3.linux.gtk.x86_64.efl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/summary-reporter/src/org/apache/harmony/eut/reporter/EUTReporter.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/summary-reporter/src/org/apache/harmony/eut/reporter/EUTReporter.java?rev=585092&r1=585091&r2=585092&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/summary-reporter/src/org/apache/harmony/eut/reporter/EUTReporter.java
(original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/summary-reporter/src/org/apache/harmony/eut/reporter/EUTReporter.java
Tue Oct 16 02:47:18 2007
@@ -57,7 +57,8 @@
         System.err.println("    <tested_vm_args>   : tested VM arguments " + 
                 "to be printed to report");
         System.err.println("    Note: the current directory must contains:");
-        System.err.println("    *  <eut_version>.suites.properties file");
+        System.err.println("    *  config/<eut_version>.suites.properties"
+                + " file");
         System.err.println("    *  tested.java.version file");
         System.err.println("    *  running.java.version file");
         System.err.println("EUT SCRIPT: "
@@ -154,8 +155,8 @@
         File eutEFL = new File(results_dir + File.separatorChar
                 + "eut.efl");
         checkFileExistance(eutEFL);
-        File eutSuitesProperties = new File("eut" + eut_version
-                + ".suites.properties");
+        File eutSuitesProperties = new File("config" + File.separatorChar
+                + "eut" + eut_version + ".suites.properties");
         checkFileExistance(eutSuitesProperties);
         File testedJavaVersionLog = new File("tested.java.version");
         checkFileExistance(testedJavaVersionLog);



Mime
View raw message