profopt.exp (profopt-execute): Check for profiling data files on the target.

        * lib/profopt.exp (profopt-execute): Check for profiling data
        files on the target.

From-SVN: r102366

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bcc41425e0bfe1b8697659d39aea8b910d90513d..affa4b6933af9a6776d64135d66f363b3a957569 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-25  Adam Nemet  <anemet@lnxw.com>
+
+        * lib/profopt.exp (profopt-execute): Check for profiling data
+        files on the target.
+
 2005-07-25  Richard Guenther  <rguenther@gcc.gnu.org>
 
        * gcc.dg/tree-ssa/flatten-1.c: Use longer function names

diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp
index 369a0c0a5c30b8984784c2651864821907a0920d..a33742cdb850611b4e9c8f1aae07c3c8c2035c91 100644 (file)
--- a/gcc/testsuite/lib/profopt.exp
+++ b/gcc/testsuite/lib/profopt.exp
@@ -231,6 +231,8 @@ proc profopt-execute { src } {
     }
 
     set executable $tmpdir/[file tail [file rootname $src].x]
+    set basename [file tail $testcase]
+    set base [file rootname $basename]
 
     set count 0
     foreach option $prof_option_list {
@@ -245,7 +247,9 @@ proc profopt-execute { src } {
        verbose "Testing $testcase, $option" 1
 
        # Remove old profiling and performance data files.
-       profopt-cleanup $testcase $prof_ext
+       foreach ext $prof_ext {
+           remote_file target delete $tmpdir/$base.$ext
+       }
        if [info exists perf_ext] {
            profopt-cleanup $testcase $perf_ext
        }
@@ -282,9 +286,8 @@ proc profopt-execute { src } {
        set missing_file 0
        # Make sure the profile data was generated, and fail if not.
        if { $status == "pass" } {
-           set basename [file tail $testcase]
-           set base [file rootname $basename]
            foreach ext $prof_ext {
+               remote_upload target $tmpdir/$base.$ext
                set files [glob -nocomplain $base.$ext]
                if { $files == "" } {
                    set status "fail"
@@ -335,7 +338,9 @@ proc profopt-execute { src } {
        }
 
        # Remove the profiling data files.
-       profopt-cleanup $testcase $prof_ext
+       foreach ext $prof_ext {
+           remote_file target delete $tmpdir/$base.$ext
+       }
 
        if { $status != "pass" } {
            continue