From e6e1f3deaccbe35da669395b5f58dfd5671869da Mon Sep 17 00:00:00 2001 From: Richard Tucker Date: Wed, 28 Oct 1998 17:36:55 +0000 Subject: [PATCH] Mend identify on unix platforms Copied from Perforce Change: 20299 ServerID: perforce.ravenbrook.com --- mps/qa/test/script/platform | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mps/qa/test/script/platform b/mps/qa/test/script/platform index 0f832998d43..7c1c6d7f7e8 100644 --- a/mps/qa/test/script/platform +++ b/mps/qa/test/script/platform @@ -138,7 +138,7 @@ sub identify { %identify = (); if ($PLATFORM =~ /^nt/) { &identify_nt; - } elsif ($PLATFORM =~ /^unix/) { + } elsif ($PLATFORM =~ /__unix/) { &identify_unix; } $identify{"time"} = localtime; @@ -153,7 +153,7 @@ sub envvar { sub comvar { my ($var, $com, $pat) = @_; - if (open(COM, $com)) { + if (open(COM, $com." 2>&1 |")) { while () { chop; if ($pat eq "" || /$pat/) { @@ -170,13 +170,13 @@ sub identify_nt { &envvar("user", "USERNAME"); &envvar("OS", "OS"); &envvar("arch", "PROCESSOR_ARCHITECTURE"); - &comvar("c_version", "cl /? 2>&1 |", ""); + &comvar("c_version", "cl /?", ""); } sub identify_unix { &comvar("machine", "uname -n", ""); &comvar("user", "whoami", ""); - &comvar("c_version", "gcc -v 2>&1 |", "version"); + &comvar("c_version", "gcc -v", "version"); &comvar("OS", "uname", ""); &comvar("arch", "arch", ""); }