From 085fdb43cc4e3e7d3b73ebe08dc869a7f8260eab Mon Sep 17 00:00:00 2001 From: Xavier Delaruelle Date: Wed, 10 May 2017 07:45:15 +0200 Subject: [PATCH] testsuite: adapt 'uname release' test for Ubuntu --- testsuite/modules.50-cmds/090-uname-proc.exp | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/testsuite/modules.50-cmds/090-uname-proc.exp b/testsuite/modules.50-cmds/090-uname-proc.exp index ad87327a..8eef75e5 100644 --- a/testsuite/modules.50-cmds/090-uname-proc.exp +++ b/testsuite/modules.50-cmds/090-uname-proc.exp @@ -87,9 +87,18 @@ if { ![file executable $domainname] } { if { [info exists uname] } { set u_sysname [exec $uname -s] set u_nodename [exec $uname -n] - set u_release [exec $uname -r] set u_version [exec $uname -v] set u_machine [exec $uname -m] + + # on ubuntu get the CODENAME of the Distribution + if {[file isfile /etc/lsb-release]} { + set fd [open "/etc/lsb-release" "r"] + set a [read $fd] + regexp -nocase {DISTRIB_CODENAME=(\S+)(.*)}\ + $a matched u_release end + } else { + set u_release [exec $uname -r] + } } @@ -129,3 +138,9 @@ if { [info exist uname] } { if { [info exist domainname] } { unset domainname } +if { [info exist fd] } { + unset fd +} +if { [info exist a] } { + unset a +}