Add GCC version to testsuite run output and systemtap.sum file.

Prints the gcc being used and full version. Also adds short version
number to systemtap.sum file (plus full version string). Will make
comparing failures based on compiler version being used easier.

* testsuite/lib/systemtap.exp (print_systemtap_version): Also print
  location and full version of gcc being used.
  (get_system_info): Get gcc version number and long version string.
* testsuite/lib/stap_run.exp (print_system_info): Output GCC version.

2 files changed, 15 insertions, 2 deletions

diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index 3043eeed..9d271ca1 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -102,12 +102,13 @@ proc no_load {} {
 }
 
 proc print_system_info {} {
-	global Host Snapshot Distro
+	global Host Snapshot Distro GCC_Version
 
 	clone_output "\nHost: $Host"
 	if {[string compare $Snapshot "unknown"]!=0} {
 		clone_output "Snapshot: $Snapshot"
 	}
+	clone_output "GCC: $GCC_Version"
 	clone_output "Distro: $Distro\n"
 }
 
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 379f6c58..3cd7a6ea 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -43,6 +43,12 @@ proc print_systemtap_version {} {
 
     print "systemtap location: $location"
     print "systemtap version: $version"
+
+    set location [exec /usr/bin/which gcc]
+    set version [exec gcc --version | head -1]
+
+    print "gcc location: $location"
+    print "gcc version: $version"
 }
 
 
@@ -152,7 +158,7 @@ proc shutdown_server {} {
 }
 
 proc get_system_info {} {
-    global Host Snapshot Distro env
+    global Host Snapshot Distro GCC_Version env
     
     set Host [exec /bin/uname -a] 
     if [file exists ../SNAPSHOT] {
@@ -173,6 +179,12 @@ proc get_system_info {} {
             if [file exists $f] then {set Distro [exec /bin/cat $f]; break }
         }
     }
+    # Easily parsable version first major minor patch level
+    set n [exec echo "__GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__" | cpp -P]
+    set n [string map {" " "."} $n]
+    # Plus full version between square brackets.
+    set full [exec gcc --version | head -1]
+    set GCC_Version "$n \[$full\]"
 }
 
 if {! [setup_systemtap_environment]} then {