[oprofile-testsuite PATCH 6/7] cosmetic updates

A handful of cosmetic updates, typo corrections, etc.

Signed-off-by: Will Schmidt <[email protected]>
---
 .../oprofile-opcontrol/oprofile-opcontrol-run.exp  |   17 +++++++++--------
 testsuite/oprofile-operf/oprofile-operf-run.exp    |    4 ++--
 .../oprofile-single_process-run.exp                |    4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/testsuite/oprofile-opcontrol/oprofile-opcontrol-run.exp b/testsuite/oprofile-opcontrol/oprofile-opcontrol-run.exp
index 1a39b3b..a20aa7f 100644
--- a/testsuite/oprofile-opcontrol/oprofile-opcontrol-run.exp
+++ b/testsuite/oprofile-opcontrol/oprofile-opcontrol-run.exp
@@ -278,19 +278,20 @@ op_get_version
 operf_get_version
 
 if {$op_version == 0} {
-    #The opcontrol program was not found. opcontrol was droped with
+    #The opcontrol program was not found. opcontrol was dropped with
     # OProfile version 1.0. We will just silently not run the opcontrol
     # tests.
-    send "\nNote:  The legacy opcontrol command is not available in\n"
-    send "       OProfile versions 1.0 and newer.  Skipping opcontrol\n"
-    send "       tests.\n"
+    send "Skipping the opcontrol tests.\n"
+    send "       The legacy opcontrol command is not available in\n"
+    send "       OProfile versions 1.0 and newer.\n"
     set opcontrol_installed 0
 } elseif {$op_version < $operf_version} {
     # Skip the opcontrol tests as the version of opcontrol is older then operf
-    send "\nThere appears to be a newer verision of OProfile installed\n"
-    send "that does not support opcontrol.  Opcontrol support was dropped\n"
-    send "with OProfile version 1.0. Will not run the opcontrol tests with\n"
-    send "the older opcontrol version.\n\n"
+    send "Skipping the opcontrol tests. \n"
+    send "  The opcontrol utility was found in the path, but appears\n"
+    send "  to be obsolete (version $op_version) with respect to the\n"
+    send "  installed version of operf (version $operf_version). \n"
+    send "  Opcontrol support was dropped with OProfile version 1.0.\n\n"
     set opcontrol_installed 0
 } else {
     check_user
diff --git a/testsuite/oprofile-operf/oprofile-operf-run.exp b/testsuite/oprofile-operf/oprofile-operf-run.exp
index c81f75e..2a4b4f8 100644
--- a/testsuite/oprofile-operf/oprofile-operf-run.exp
+++ b/testsuite/oprofile-operf/oprofile-operf-run.exp
@@ -131,11 +131,11 @@ if { $operf_version == 0 } {
 	if {$opcontrol_installed == 1} {
             local_exec "opcontrol --deinit" "" "" 100
             # Make sure there are no samples from the opcontrol laying
-            # around that opreport might inadvertenly pick up.
+            # around that opreport might inadvertently pick up.
             op_daemon_delete_any_samples
         }
         # Make sure there are no samples from the operf laying
-        # around that opreport might inadvertenly pick up.
+        # around that opreport might inadvertently pick up.
 	operf_delete_samples
 
        check_user
diff --git a/testsuite/oprofile-single_process/oprofile-single_process-run.exp b/testsuite/oprofile-single_process/oprofile-single_process-run.exp
index 69fc85f..caeb002 100644
--- a/testsuite/oprofile-single_process/oprofile-single_process-run.exp
+++ b/testsuite/oprofile-single_process/oprofile-single_process-run.exp
@@ -75,13 +75,13 @@ if {$op_deps_ok == 0} {
 operf_get_version
 
 if { $operf_version == 0} {
-    send "\nThe OProfile operf user tool is not supported.  Will not run operf tests.\n"
+    send "\nThe OProfile operf userspace utility was not found.  Will not run operf tests.\n"
 } else {
     # Ensure that the oprofile kernel module is unloaded, since it can
     # interfere with proper operf operation on some platforms.
     local_exec "opcontrol --deinit" "" "" 100
     # Make sure there are no samples from operf laying around that opreport
-    # might inadvertenly pick up.  Unfortunately, the user needs to make sure
+    # might inadvertently pick up.  Unfortunately, the user needs to make sure
     # the opcontrol data was previously deleted as root.  The goal is to be
     # able to run this test as a regular user.
     operf_delete_samples


------------------------------------------------------------------------------
Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140