summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwenji <wenji>2007-09-28 08:01:00 +0000
committerwenji <wenji>2007-09-28 08:01:00 +0000
commit9446a6d68e4cea3554ecbbacb673b1be9dc89919 (patch)
treef586bb7d49b31d8a9ddb3e4823aae56615122933
parent3cd0e15acc565ac8b02f99e3750118c93fd6324c (diff)
downloadsystemtap-steved-9446a6d68e4cea3554ecbbacb673b1be9dc89919.tar.gz
systemtap-steved-9446a6d68e4cea3554ecbbacb673b1be9dc89919.tar.xz
systemtap-steved-9446a6d68e4cea3554ecbbacb673b1be9dc89919.zip
2007-09-28 Wenji Huang <wenji.huang@oracle.com>
* lib/systemtap.exp: New proc get_system_info. * lib/stap_run.exp: New proc print_system_info.
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/lib/stap_run.exp11
-rw-r--r--testsuite/lib/systemtap.exp16
3 files changed, 32 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index a95ebca0..035e46ed 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-28 Wenji Huang <wenji.huang@oracle.com>
+
+ * lib/systemtap.exp: New proc get_system_info.
+ * lib/stap_run.exp: New proc print_system_info.
+
2007-09-27 Masami Hiramatsu <mhiramat@redhat.com>
PR3916
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp
index ff93ed8a..c9131562 100644
--- a/testsuite/lib/stap_run.exp
+++ b/testsuite/lib/stap_run.exp
@@ -86,5 +86,16 @@ proc no_load {} {
return 0
}
+proc print_system_info {} {
+ global Host Snapshot Distro
+
+ clone_output "\nHost: $Host"
+ if {[string compare $Snapshot "unknown"]!=0} {
+ clone_output "Snapshot: $Snapshot"
+ }
+ clone_output "Distro: $Distro\n"
+}
+
+print_system_info
# tests better all be true
set all_pass_string "(systemtap test success\r\n)+$"
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp
index 6c8ed540..5b08c233 100644
--- a/testsuite/lib/systemtap.exp
+++ b/testsuite/lib/systemtap.exp
@@ -49,9 +49,25 @@ proc setup_systemtap_environment {} {
}
}
+proc get_system_info {} {
+ global Host Snapshot Distro env
+
+ set Host [exec /bin/uname -a]
+ if [file exists $env(SRCDIR)/../SNAPSHOT] {
+ set Snapshot [exec /bin/cat $env(SRCDIR)/../SNAPSHOT]
+ } else {
+ set Snapshot "unknown"
+ }
+ set Distro "Linux"
+ if [file exists /etc/fedora-release] {set Distro [exec /bin/cat /etc/fedora-release]}
+ if [file exists /etc/redhat-release] {set Distro [exec /bin/cat /etc/redhat-release]}
+ if [file exists /etc/suse-release] {set Distro [exec /bin/cat /etc/suse-release]}
+ if [file exists /etc/debian_version] {set Distro [exec /bin/cat /etc/debian_version]}
+}
setup_systemtap_environment
print_systemtap_version
+get_system_info
proc systemtap_init {args} {}
proc systemtap_version {} {}