NNT: Add -nouname option, so machine uniquing can occur across physical machines.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98633 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-03-16 15:53:02 +00:00
parent d165e1a711
commit c613969122

View File

@ -24,6 +24,7 @@ use Socket;
# IMPLEMENTED. # IMPLEMENTED.
# -nickname NAME The NAME argument specifieds the nickname this script # -nickname NAME The NAME argument specifieds the nickname this script
# will submit to the nightlytest results repository. # will submit to the nightlytest results repository.
# -nouname Don't include uname data (machine will be identified by nickname only).
# -submit-server Specifies a server to submit the test results too. If this # -submit-server Specifies a server to submit the test results too. If this
# option is not specified it defaults to # option is not specified it defaults to
# llvm.org. This is basically just the address of the # llvm.org. This is basically just the address of the
@ -220,6 +221,7 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
$LLVMGCCPATH = $ARGV[0] . '/bin'; $LLVMGCCPATH = $ARGV[0] . '/bin';
shift; next;} shift; next;}
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; } if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
if (/^-nouname$/) { $NOUNAME = 1; next; }
if (/^-use-gmake/) { $MAKECMD = "gmake"; shift; next; } if (/^-use-gmake/) { $MAKECMD = "gmake"; shift; next; }
if (/^-extraflags/) { $CONFIGUREARGS .= if (/^-extraflags/) { $CONFIGUREARGS .=
" --with-extra-options=\'$ARGV[0]\'"; shift; next;} " --with-extra-options=\'$ARGV[0]\'"; shift; next;}
@ -693,12 +695,21 @@ $endtime = `date "+20%y-%m-%d %H:%M:%S"`;
if ( $VERBOSE ) { print "PREPARING LOGS TO BE SENT TO SERVER\n"; } if ( $VERBOSE ) { print "PREPARING LOGS TO BE SENT TO SERVER\n"; }
if ( ! $NOUNAME ) {
$machine_data = "uname: ".`uname -a`. $machine_data = "uname: ".`uname -a`.
"hardware: ".`uname -m`. "hardware: ".`uname -m`.
"os: ".`uname -sr`. "os: ".`uname -sr`.
"name: ".`uname -n`. "name: ".`uname -n`.
"date: ".`date \"+20%y-%m-%d\"`. "date: ".`date \"+20%y-%m-%d\"`.
"time: ".`date +\"%H:%M:%S\"`; "time: ".`date +\"%H:%M:%S\"`;
} else {
$machine_data = "uname: (excluded)\n".
"hardware: ".`uname -m`.
"os: ".`uname -sr`.
"name: $nickname\n".
"date: ".`date \"+20%y-%m-%d\"`.
"time: ".`date +\"%H:%M:%S\"`;
}
# Get gcc version. # Get gcc version.
my $gcc_version_long = ""; my $gcc_version_long = "";