diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-03-30 15:41:31 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-03-30 15:41:31 -0400 |
| commit | 8f2b14197e7db279434c5b063b755d1121c137de (patch) | |
| tree | e6d335d41fbe085fccac277a5565dd089267db32 /testsuite/lib | |
| parent | 4407fecb4b4e7466b256a26d1bfd63333bf367a2 (diff) | |
| parent | 267a544424be10825c57ea3eaa4d908c818211c7 (diff) | |
| download | systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.tar.gz systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.tar.xz systemtap-steved-8f2b14197e7db279434c5b063b755d1121c137de.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
aclocal.m4
configure
testsuite/aclocal.m4
Also:
2009-03-30 Dave Brolley <brolley@redhat.com>
* nsscommon.c (nssError): Handle SEC_ERROR_BAD_SIGNATURE.
2009-03-30 Dave Brolley <brolley@redhat.com>
* modverify.c (verify_it): Print a message if the module may have been
tampered with.
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/systemtap.exp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index c80ad171..554e88ed 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -148,13 +148,18 @@ proc get_system_info {} { set Snapshot [exec /bin/cat $env(SRCDIR)/../SNAPSHOT] } else { regexp {version [^)]*} [exec stap -V 2>@ stdout] version - set Snapshot $version + set Snapshot $version } 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]} + if [file exists /usr/bin/lsb_release] { + # this produces one line of this format: + # Distribution:\tSTRING + set Distro [lrange [exec /usr/bin/lsb_release -d] 1 end] + } else { + foreach f {/etc/fedora-release /etc/enterprise-release /etc/redhat-release /etc/suse-release /etc/debian_version} { + if [file exists $f] then {set Distro [exec /bin/cat $f]; break } + } + } } if {! [setup_systemtap_environment]} then { |