From 334a03fd1e560c81ccf7b3a47e7481307fc5babe Mon Sep 17 00:00:00 2001
From: Adam Nemet <anemet@lnxw.com>
Date: Mon, 25 Jul 2005 18:55:29 +0000
Subject: [PATCH] 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
---
 gcc/testsuite/ChangeLog       |  5 +++++
 gcc/testsuite/lib/profopt.exp | 13 +++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index bcc41425e0bf..affa4b6933af 100644
--- 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 369a0c0a5c30..a33742cdb850 100644
--- 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