Diff of /testsuite/oprofile-operf/oprofile-operf-run.exp [485655] .. [e2a4ff]  Maximize  Restore

Switch to side-by-side view

--- a/testsuite/oprofile-operf/oprofile-operf-run.exp
+++ b/testsuite/oprofile-operf/oprofile-operf-run.exp
@@ -22,30 +22,7 @@
 load_lib "op_workloads.exp"
 load_lib "verify.exp"
 
-set operf_version ""
-
-proc operf_get_version {} {
-    global operf_version
-
-    set test "OProfile operf version check"
-    verbose $test
-    set result [ local_exec "operf -v" "" "" 100 ]
-
-    if {[regexp "\[0-9\]+\(.\[0-9\]+\)+\[a-zA-Z_\]*" $result operf_version] == 1} {
-
-#	Need to make sure the kernel has operf support as well
-	if {[lindex [local_exec op-check-perfevents "" "" 100] 0] == 0} {
-	    pass $test
-	} else {
-	    verbose "Kernel does not support operf\n"
-	    set operf_version 0
-	}
-    } else {
-	verbose "unable to determine version"
-	set operf_version 0
-	warning $test
-    }
-}
+set operf_version 0
 
 proc do_test {ctrs symbol_check} {
 #   The tests are run in system-wide mode which requires the user to be
@@ -145,25 +122,6 @@
     }
 }
 
-proc operf_check_samples_exist {ctrs} {
-    set test "nonzero-sized sample file creation"
-
-    verbose "checking for nonzero sample files"
-
-    foreach ctr $ctrs {
-	set n [lindex $ctr 0]
-	set event [lindex $ctr 1]
-
-	verbose "running opreport --symbols --long-filenames event:$event"
-	set result [ local_exec "opreport --symbols --long-filenames event:$event" "" "" 100 ]
-	if { [regexp "error:" "$result" ]} {
-	    fail "$test: {$event} created nonzero sample files"
-	} else {
-	    pass "$test: {$event} created nonzero sample files"
-	}
-    }
-}
-
 proc oprofile-operf_run_tests {} {
     global op_event_table
     set cpu [operf_cpu_type]
@@ -194,7 +152,7 @@
 
     operf_get_version
 
-    if { $operf_version == 0} {
+    if { $operf_version == 0 } {
 	send "\nThe OProfile operf user tool is not supported.  Will not run operf tests.\n"
     } else {
 	# Make sure there are no samples from the opcontrol or operf laying