From: wenji Date: Fri, 28 Sep 2007 08:01:00 +0000 (+0000) Subject: 2007-09-28 Wenji Huang X-Git-Tag: release-0.6~124 X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=9446a6d68e4cea3554ecbbacb673b1be9dc89919;p=systemtap.git 2007-09-28 Wenji Huang * lib/systemtap.exp: New proc get_system_info. * lib/stap_run.exp: New proc print_system_info. --- diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index a95ebca00..035e46ede 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2007-09-28 Wenji Huang + + * lib/systemtap.exp: New proc get_system_info. + * lib/stap_run.exp: New proc print_system_info. + 2007-09-27 Masami Hiramatsu PR3916 diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index ff93ed8ab..c91315628 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 6c8ed5406..5b08c2338 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 {} {}