bug 509266 - Sisyphus - Ubuntu 9.04 issues: will not read environment strings from set pipe, autoconf detection, r=ctalbert.
authorBob Clary <bclary@bclary.com>
Tue, 18 Aug 2009 00:29:59 -0700
changeset 31863 d979796dede4ff81eed2d498fc6a053ff1335a3b
parent 31862 415a18e1202510729f145e3b5926194159a59e21
child 31864 496fddacf2743a2ebf743f859a546d21c500bc86
push id8746
push userrsayre@mozilla.com
push dateTue, 25 Aug 2009 16:53:43 +0000
treeherdermozilla-central@189759c41621 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersctalbert
bugs509266
milestone1.9.3a1pre
bug 509266 - Sisyphus - Ubuntu 9.04 issues: will not read environment strings from set pipe, autoconf detection, r=ctalbert.
testing/sisyphus/bin/build.sh
testing/sisyphus/bin/memory.pl
--- a/testing/sisyphus/bin/build.sh
+++ b/testing/sisyphus/bin/build.sh
@@ -121,16 +121,18 @@ case $product in
             mkdir -p "$JS_OBJDIR"
 
             # run autoconf when configure.in is newer than configure
             if [[ configure.in -nt configure ]]; then
                 if [[ "$OSID" == "nt" ]]; then
                     AUTOCONF=autoconf-2.13
                 elif findprogram autoconf-2.13; then
                     AUTOCONF=autoconf-2.13
+                elif findprogram autoconf2.13; then
+                    AUTOCONF=autoconf2.13
                 elif findprogram autoconf213; then
                     AUTOCONF=autoconf213
                 else
                     error "autoconf 2.13 not detected"
                 fi
 
                 if ! $buildbash $bashlogin -c "export PATH=\"$BUILDPATH\"; cd $BUILDTREE/mozilla/js/src; eval \"$AUTOCONF\";" 2>&1; then
                     error "during js/src autoconf" $LINENO
--- a/testing/sisyphus/bin/memory.pl
+++ b/testing/sisyphus/bin/memory.pl
@@ -44,18 +44,20 @@ my $tmpmemory;
 my $unitmemory;
 my $raw_memory = 0;
 my $swap_memory = 0;
 my $ulimit_maxmemory = 0;
 my $ulimit_virtualmemory = 0;
 my $test_memory = 0;
 
 # hack around lack of available environment entries in both
-# cygwin perl and redhat perl
-open OSTYPE, "set | grep OSTYPE |" || die "Unable to open OSTYPE: $!";
+# cygwin perl and redhat perl.
+# Note the bash -c set is required for ubuntu 9.04 otherwise the
+# OSTYPE file will return no data. I don't know why.
+open OSTYPE, "bash -c set | grep OSTYPE |" || die "Unable to open OSTYPE: $!";
 while (<OSTYPE>)
 {
     chomp;
     $ostype .= $_;
 }
 close OSTYPE;
 
 die "Unable to determine OSTYPE" if (!$ostype);