diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2009-03-29 16:40:13 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2009-03-29 16:40:13 -0400 |
| commit | 172d72b30e804bda124f26b858f0f3081a561b3c (patch) | |
| tree | ec06b7ba73ca72596c5f795db23090f742d0e963 /testsuite/lib | |
| parent | 23d89280bdf6bf4c341478eb766dba9d4f395708 (diff) | |
| download | systemtap-steved-172d72b30e804bda124f26b858f0f3081a561b3c.tar.gz systemtap-steved-172d72b30e804bda124f26b858f0f3081a561b3c.tar.xz systemtap-steved-172d72b30e804bda124f26b858f0f3081a561b3c.zip | |
prefer using /usr/bin/lsb_release to deduce distribution for testsuite
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/systemtap.exp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index b9db4e40..554e88ed 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -148,11 +148,17 @@ 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" - 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 [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 } + } } } |