You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stdcxx.apache.org by fa...@apache.org on 2007/07/26 20:41:37 UTC
svn commit: r559932 - in /incubator/stdcxx/trunk/etc/config/windows:
projectdef.js projects.js runall.wsf utilities.js
Author: faridz
Date: Thu Jul 26 11:41:36 2007
New Revision: 559932
URL: http://svn.apache.org/viewvc?view=rev&rev=559932
Log:
2007-07-26 Farid Zaripov <Fa...@epam.com>
* utilities.js: Added global variable EXEC_TIMEOUT = 300 seconds.
* projectdef.js: Removed execTimeout variable, instead used EXEC_TIMEOUT.
* runall.wsf: Removed /COMPAT option, added /RUNFLAGS option.
* projects.js: Added proper /RUNFLAGS:... to runExamples, runTests,
testLocale projects.
Modified:
incubator/stdcxx/trunk/etc/config/windows/projectdef.js
incubator/stdcxx/trunk/etc/config/windows/projects.js
incubator/stdcxx/trunk/etc/config/windows/runall.wsf
incubator/stdcxx/trunk/etc/config/windows/utilities.js
Modified: incubator/stdcxx/trunk/etc/config/windows/projectdef.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projectdef.js?view=diff&rev=559932&r1=559931&r2=559932
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projectdef.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projectdef.js Thu Jul 26 11:41:36 2007
@@ -27,9 +27,6 @@
var TristateTrue = -1;
var TristateFalse = 0;
-// the timeout for the exec utility
-var execTimeout = 180;
-
var dte = null;
var VCProjectEngine = null;
var ICConvertTool = "ICProjConvert90.exe";
@@ -793,7 +790,7 @@
sanityDef.PreBuildCmd +=
"echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
" /s /b:\"" + bindir + "\" > \"" + test + ".bat\"";
- sanityDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + execTimeout + " \"" + test + ".bat\"";
+ sanityDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + EXEC_TIMEOUT + " \"" + test + ".bat\"";
sanityDef.CustomBuildOut = test + ".out";
projectDefs.push(sanityDef);
@@ -846,7 +843,7 @@
"echo cscript /nologo \"" + srcdir + "\\run_locale_utils.wsf\"" +
" /f /b:\"" + bindir + "\" /i:\"" + nlsDir + "\"" +
" /l:" + locale.Name + " > \"" + test + ".bat\"";
- projectDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + execTimeout + " \"" + test + ".bat\"";
+ projectDef.CustomBuildCmd = setPath + "\r\n\"" + exec + "\" -t " + EXEC_TIMEOUT + " \"" + test + ".bat\"";
projectDef.CustomBuildOut = test + ".out";
projectDef.PrjDeps.push(sanityDef);
Modified: incubator/stdcxx/trunk/etc/config/windows/projects.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/projects.js?view=diff&rev=559932&r1=559931&r2=559932
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/projects.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/projects.js Thu Jul 26 11:41:36 2007
@@ -257,7 +257,8 @@
" /EXEDIR:\"$(OutDir)\"" +
" /PRJDIR:\"" + runexamplesDef.VCProjDir + "\"" +
" /CONFIG:\"%SOLUTION%\"" +
- " /LOGFILE:\"runexamples.log\"";
+ " /LOGFILE:\"runexamples.log\"" +
+ " /RUNFLAGS:\"-t " + EXEC_TIMEOUT + "\"";
runexamplesDef.CustomBuildOut = "$(OutDir)\\runexamples.log";
runexamplesDef.CustomBuildDeps = "%FILES%";
//runexamplesDef.PrjDeps.push(allexamplesDef);
@@ -317,8 +318,8 @@
" /EXEDIR:\"$(OutDir)\"" +
" /PRJDIR:\"" + runtestsDef.VCProjDir + "\"" +
" /CONFIG:\"%SOLUTION%\"" +
- " /COMPAT" +
- " /LOGFILE:\"runtests.log\"";
+ " /LOGFILE:\"runtests.log\"" +
+ " /RUNFLAGS:\"--compat -x \'--compat -O -\' -t " + EXEC_TIMEOUT + "\"";
runtestsDef.CustomBuildOut = "$(OutDir)\\runtests.log";
runtestsDef.CustomBuildDeps = "%FILES%";
//runtestsDef.PrjDeps.push(alltestsDef);
@@ -395,7 +396,8 @@
" /EXEDIR:\"$(OutDir)\"" +
" /CONFIG:\"%SOLUTION%\"" +
" /LOGFILE:\"runloctests.log\"" +
- " /EXT:bat";
+ " /EXT:bat" +
+ " /RUNFLAGS:\"-t " + EXEC_TIMEOUT + "\"";
testlocaleTplDef.CustomBuildOut = "$(OutDir)\\runloctests.log";
var testlocalesDef = testlocaleTplDef.createTestLocalesDef("%SRCDIR%\\etc\\nls");
Modified: incubator/stdcxx/trunk/etc/config/windows/runall.wsf
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/runall.wsf?view=diff&rev=559932&r1=559931&r2=559932
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/runall.wsf (original)
+++ incubator/stdcxx/trunk/etc/config/windows/runall.wsf Thu Jul 26 11:41:36 2007
@@ -34,10 +34,10 @@
name="INOUTDIR" required="false" type="string"/>
<named helpstring="The log file" name="LOGFILE"
required="false" type="string"/>
- <named helpstring="Run tests in compat mode" name="COMPAT"
- required="false" type="string"/>
<named helpstring="The examples extension" name="EXT"
required="false" type="string"/>
+ <named helpstring="The additional options for exec utility"
+ name="RUNFLAGS" required="false" type="string"/>
<example>
cscript runall.wsf /EXEDIR:"C:\stdcxx\build\examples"
/PRJDIR:"C:\stdcxx\build\projects\examples"
@@ -46,7 +46,7 @@
<usage>
Usage: cscript runexamples.wsf /EXEDIR:@EXEDIR /CONFIG:@CONFIG
[/PRJDIR:@PRJDIR] [/INOUTDIR:@INOUTDIR] [/LOGFILE:@LOGFILE]
-[/COMPAT] [/EXT:@EXT]
+[/EXT:@EXT] [/RUNFLAGS:@RUNFLAGS]
where
@EXEDIR is the root directory with executables to be run and checked,
@PRJDIR is the directory with .vcproj files of the executables,
@@ -54,8 +54,8 @@
required by executables,
@CONFIG is the compiler configuration (msvc-7.1, icc-9.0, etc),
@LOGFILE is the log file name,
-@COMPAT is the option for run tests in compat mode,
@EXT is the extension of the example files, default value: "exe".
+@RUNFLAGS is the additional options for exec utility
</usage>
</runtime>
<object id="fso" progid="Scripting.FileSystemObject"/>
@@ -76,8 +76,8 @@
var currentCfg = "msvc-7.1" // the configuration
var logFileName = ""; // the log file name
var logFileDefault = "runexamples.log"; // the default log file name
-var compatMode = false;
var ext = "exe";
+var runflags = "";
var varOut = "out";
@@ -88,8 +88,6 @@
var exBadCode = 0;
var exNotCompiled = 0;
-var runTimeout = 180;
-
var buildlogFile = "BuildLog.htm";
var summaryFileName = "Summary.htm";
var htmFolderName = "temphtm";
@@ -165,12 +163,15 @@
else
logFileName = logFileDefault;
- if (WScript.Arguments.Named.Exists("COMPAT"))
- compatMode = true;
-
if (WScript.Arguments.Named.Exists("EXT"))
ext = WScript.Arguments.Named("EXT");
+ if (WScript.Arguments.Named.Exists("RUNFLAGS"))
+ {
+ runflags = WScript.Arguments.Named("RUNFLAGS");
+ runflags = runflags.replace(/\'/g, "\"");
+ }
+
if (! fso.FolderExists(examplesDir))
{
WScript.StdErr.WriteLine(
@@ -242,14 +243,14 @@
++exRun;
}
- var runCmd = "\"" + utlExec + "\" -t " + runTimeout;
+ var runCmd = "\"" + utlExec + "\"";
if (0 < srcDir.length)
runCmd += " -d \"" + srcDir + "\"";
- if (compatMode)
- runCmd += " --compat -x \"--compat -O -\"";
-
+ if (0 < runflags.length)
+ runCmd += " " + runflags;
+
runCmd += " " + exeFiles.join(" ");
var prevDir = WshShell.CurrentDirectory;
Modified: incubator/stdcxx/trunk/etc/config/windows/utilities.js
URL: http://svn.apache.org/viewvc/incubator/stdcxx/trunk/etc/config/windows/utilities.js?view=diff&rev=559932&r1=559931&r2=559932
==============================================================================
--- incubator/stdcxx/trunk/etc/config/windows/utilities.js (original)
+++ incubator/stdcxx/trunk/etc/config/windows/utilities.js Thu Jul 26 11:41:36 2007
@@ -41,6 +41,9 @@
var PLATFORM = "Win32";
var CLVARSBAT = "";
+// timeout for exec utility in seconds
+var EXEC_TIMEOUT = 300;
+
// read and parse compiler configuration file
// config - name of the compiler configuration
function parseConfig(config)