Checkin for Bindu's changes to the scripts to eliminate BuildID detection, and to change default drive to D. Not part of build.

This commit is contained in:
attinasi%netscape.com 2000-08-31 22:39:27 +00:00
parent 51f409388d
commit 8feb85ee9f
7 changed files with 110 additions and 99 deletions

View File

@ -1,39 +1,39 @@
file:///S|/Mozilla/Tools/performance/layout/WebSites/altavista/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/altavista/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/amazon/104-8589910-8095661.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/angelfire/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/barnesandnoble/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/bluemountain/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/cnet/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/cnn/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/compuserve/default.asp.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/disney/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/download/index(1).html
file:///S|/Mozilla/Tools/performance/layout/WebSites/ebay/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/espn/index.30.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/excite/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/expedia/Default.asp.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/geocities/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/go/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/goto/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/hotbot/index(1).html
file:///S|/Mozilla/Tools/performance/layout/WebSites/hotmail/login.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/icq/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/infospace/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/lycos/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/playboy/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/msnbc/default.asp.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/netscape/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/previewtravel/index(1).html
file:///S|/Mozilla/Tools/performance/layout/WebSites/quicken/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/real/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/simplenet/index(1).html
file:///S|/Mozilla/Tools/performance/layout/WebSites/snap/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/sony/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/travelocity/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/tripod/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/weather/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/webcrawler/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/xoom/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/yahoo/index.html
file:///S|/Mozilla/Tools/performance/layout/WebSites/zdnet/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/altavista/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/altavista/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/amazon/104-8589910-8095661.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/angelfire/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/barnesandnoble/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/bluemountain/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/cnet/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/cnn/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/compuserve/default.asp.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/disney/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/download/index(1).html
file:///d|/Mozilla/Tools/performance/layout/WebSites/ebay/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/espn/index.30.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/excite/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/expedia/Default.asp.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/geocities/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/go/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/goto/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/hotbot/index(1).html
file:///d|/Mozilla/Tools/performance/layout/WebSites/hotmail/login.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/icq/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/infospace/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/lycos/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/playboy/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/msnbc/default.asp.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/netscape/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/previewtravel/index(1).html
file:///d|/Mozilla/Tools/performance/layout/WebSites/quicken/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/real/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/simplenet/index(1).html
file:///d|/Mozilla/Tools/performance/layout/WebSites/snap/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/sony/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/travelocity/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/tripod/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/weather/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/webcrawler/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/xoom/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/yahoo/index.html
file:///d|/Mozilla/Tools/performance/layout/WebSites/zdnet/index.html

View File

@ -37,30 +37,32 @@ $NumOfSites = $ARGV[2];
$buildRoot = $ARGV[3];
$LinkURL = $ARGV[4];
$useClockTime = $ARGV[5];
$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
#$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
#$buildIDFile = "";
debug_print( "Arguments:[ $UrlName | $logFile | $NumOfSites | $buildRoot | $LinkURL | $useClockTime]\n");
#------------------------------------------------------------------------------
# Open the ID file and get the build ID
#------------------------------------------------------------------------------
open (XUL_FILE, $buildIDFile) or die "Cannot open BuildID file $buildIDFile (AverageTable2.pl)\n";
$BuildNo = "";
$LineList;
while (<XUL_FILE>)
{
$ThisLine = $_;
chop ($ThisLine);
if (/Build ID/){
@LineList = split (/\"/, $ThisLine);
$BuildNo = $LineList[1];
}
}
@LineList = split (/ /, $BuildNo);
$BuildNo = $LineList[2];
$BuildNo =~ s/"//g;
$BuildNo =~ s/[>]//g;
debug_print ("Build Number: $BuildNo\n");
close( XUL_FILE );
#open (XUL_FILE, $buildIDFile) or die "Cannot open BuildID file $buildIDFile (AverageTable2.pl)\n";
#$BuildNo = "";
#$LineList;
#while (<XUL_FILE>)
#{
# $ThisLine = $_;
# chop ($ThisLine);
# if (/Build ID/){
# @LineList = split (/\"/, $ThisLine);
# $BuildNo = $LineList[1];
# }
#}
#@LineList = split (/ /, $BuildNo);
#$BuildNo = $LineList[2];
#$BuildNo =~ s/"//g;
#$BuildNo =~ s/[>]//g;
#debug_print ("Build Number: $BuildNo\n");
#close( XUL_FILE );
#------------------------------------------------------------------------------
# Open the logfile (input)
@ -68,7 +70,6 @@ close( XUL_FILE );
#------------------------------------------------------------------------------
open (LOG_FILE, "< $logFile") or die "Logfile $logFile could not be opened";
#------------------------------------------------------------------------------
# Deviation file:
# Flat file used to calculate and display deviation between latest and
@ -78,12 +79,17 @@ open (LOG_FILE, "< $logFile") or die "Logfile $logFile could not be opened";
# BuildNo,date,url,parsingtime,parsingper,contenttime,contentper,frametime,
# frameper,styletime,styleper,reflowtime,reflowper,totallayouttime,totallayoutper,
# totalpageloadtime
($Second, $Minute, $Hour, $DayOfMonth, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime (time);
$RealMonth = $Month + 1;
$Year += 1900;
$BuildNo = $RealMonth.$DayOfMonth.$Year;
$file = $BuildNo.".dat";
open (DEVIATION, ">> $file") or die "Deviation file could not be opened";
# add entry to the deviation file
($Second, $Minute, $Hour, $DayOfMonth, $Month, $Year, $$WeekDay, $DayOfYear, $IsDST) = localtime (time);
($Second, $Minute, $Hour, $DayOfMonth, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime (time);
$RealMonth = $Month + 1;
$Year += 1900;
$date2 = $RealMonth.$DayOfMonth.$Year;
print (DEVIATION "$BuildNo,$date2,$UrlName,");

View File

@ -32,7 +32,7 @@ sub debug_print {
#------------------------------------------------------------------------------
@ARGV;
$buildRoot = $ARGV[0];
$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
#$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
$PullID = $ARGV[1];
#------------------------------------------------------------------------------
@ -58,23 +58,22 @@ $count = 0;
#------------------------------------------------------------------------------
# Get the BuildID
open (XUL_FILE, $buildIDFile) or die "Unable to open BuildID file $buildIDFile (footer.pl)";
$BuildNo = "";
$LineList;
while (<XUL_FILE>)
{
$ThisLine = $_;
chop ($ThisLine);
if (/Build ID/){
@LineList = split (/\"/, $ThisLine);
$BuildNo = $LineList[1];
}
}
$BuildNo =~ s/"//g;
$BuildNo =~ s/[>]//g;
close (XUL_FILE);
debug_print ($BuildNo);
#open (XUL_FILE, $buildIDFile) or die "Unable to open BuildID file $buildIDFile (footer.pl)";
#$BuildNo = "";
#$LineList;
#while (<XUL_FILE>)
#{
# $ThisLine = $_;
# chop ($ThisLine);
# if (/Build ID/){
# @LineList = split (/\"/, $ThisLine);
# $BuildNo = $LineList[1];
# }
#}
#$BuildNo =~ s/"//g;
#$BuildNo =~ s/[>]//g;
#close (XUL_FILE);
#debug_print ($BuildNo);
#------------------------------------------------------------------------------
# Process the averages file: get the number of entries

View File

@ -35,27 +35,27 @@ sub debug_print {
}
@ARGV;
$buildRoot = $ARGV[0];
$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
#$buildRoot = $ARGV[0];
#$buildIDFile = '< '.$buildRoot.'\bin\chrome\locales\en-US\navigator\locale\navigator.dtd';
$pullDate = $ARGV[1];
$useClockTime = $ARGV[2];
open (XUL_FILE, $buildIDFile) or die "Unable to open BuildID file $buildIDFile (header.pl)";
$BuildNo = "";
$LineList;
while (<XUL_FILE>)
{
$ThisLine = $_;
chop ($ThisLine);
if (/Build ID/){
@LineList = split (/\"/, $ThisLine);
$BuildNo = $LineList[1];
}
}
$BuildNo =~ s/"//g;
$BuildNo =~ s/[>]//g;
close (XUL_FILE);
debug_print ($BuildNo);
#open (XUL_FILE, $buildIDFile) or die "Unable to open BuildID file $buildIDFile (header.pl)";
#$BuildNo = "";
#$LineList;
#while (<XUL_FILE>)
#{
# $ThisLine = $_;
# chop ($ThisLine);
# if (/Build ID/){
# @LineList = split (/\"/, $ThisLine);
# $BuildNo = $LineList[1];
# }
#}
#$BuildNo =~ s/"//g;
#$BuildNo =~ s/[>]//g;
#close (XUL_FILE);
#debug_print ($BuildNo);
#############################################
@ -77,7 +77,7 @@ open (TABLE_FILE, ">table.html");
print (TABLE_FILE "<center><b><font size=+2>Top 40 Sites - File Load Performance Metrics</font></b></center>");
print (TABLE_FILE "<center><b><font size=+2>Seamonkey Win32</font></B></Center>");
print (TABLE_FILE "<BR>");
print (TABLE_FILE "<center><font size=+2 color=maroon>$pullDate / $BuildNo </font></center>");
print (TABLE_FILE "<center><font size=+2 color=maroon>$pullDate</font></center>");
print (TABLE_FILE "<BR><center><b><font size=+1>");
print (TABLE_FILE "$weekday{$wday} ");
print (TABLE_FILE "$mon/$mday/$year ");

View File

@ -33,7 +33,10 @@ $cnt = 0;
system( ("copy", "history.txt", "history.bak" ) );
# Delete the average.txt file so we don;t get old values in the averages
system( ("del", "average.txt") );
if (-e "average.txt")
{
system( ("del", "average.txt") );
}
# Run the Header script
system( ("perl", "header.pl", "$bldRoot", "$milestone", "$ARGV[2]" ) );

View File

@ -19,3 +19,6 @@ Daily07_19,Build ID: 2000061408,0.0803684210526316,13.6588564720687,0.0794736842
Daily_0727,Build ID: 2000061408,0.0864473684210526,14.8496179287778,0.0700263157894737,11.4691502612223,0.0723684210526316,11.9528521843013,0.162078947368421,29.0402974065621,0.176394736842105,30.0565032717679,0.567315789473684,62.2281317249474,0.891052631578947
Daily_0802,Build ID: 2000073008,0.085578947368421,20.2969834741766,0.0769736842105263,19.0427722405871,0.0414473684210526,9.88156171893945,0.167052631578947,42.5860302145605,0.0271842105263158,5.56107340436745,0.398236842105263,63.5021723420153,0.618894736842105
Daily_0809,Build ID: 2000073008,0.0822894736842105,14.7656969014406,0.0785526315789474,14.6555692727582,0.0660789473684211,12.8089137131713,0.122236842105263,22.393150816493,0.177315789473684,32.7450903487687,0.526473684210526,66.9527399145024,0.764421052631579
Daily_0816,Build ID: 2000073008,0.0831578947368421,14.6279414806599,0.0745263157894737,13.1561303405684,0.0645789473684211,11.8999399762846,0.135710526315789,24.8256376029632,0.179421052631579,32.8587716521555,0.537394736842105,66.181868405864,0.789921052631579
Daily_0823,Build ID: 2000073008,0.0777631578947368,13.5216347157235,0.0798947368421053,14.7204565037397,0.0672368421052632,12.3334006242686,0.135815789473684,24.8152177661246,0.174473684210526,31.9777114427753,0.535184210526316,67.1723945062311,0.779263157894737
Daily_0830,,0.0916842105263158,16.1046766737444,0.0802368421052632,14.3999178149049,0.0670263157894737,12.1667343903002,0.136131578947368,24.2353063617544,0.174394736842105,30.4617858119279,0.549473684210526,67.3807590460521,0.790342105263158

View File

@ -40,7 +40,7 @@ $profID = $ARGV[3];
$arg=0;
$cmdLineArg[$arg++] = "-f ";
##$cmdLineArg[$arg++] = "S:\\mozilla\\tools\\performance\\layout\\40-url-dup.txt ";
$cmdLineArg[$arg++] = "S:\\mozilla\\tools\\performance\\layout\\40-url.txt ";
$cmdLineArg[$arg++] = "D:\\mozilla\\tools\\performance\\layout\\40-url.txt ";
if($UseViewer==0){
$cmdLineArg[$arg++] = "-ftimeout ";
$cmdLineArg[$arg++] = "10 ";