Commit 56db1fbf authored by Jayesh Krishna's avatar Jayesh Krishna
Browse files

[svn-r4104] Explicitly specifying path to executables in the fortran project...

[svn-r4104] Explicitly specifying path to executables in the fortran project template file. This makes it easier for the windows test scripts
parent 3be6fa6d
......@@ -9,7 +9,7 @@
<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" DebugInformationFormat="debugEnabled" Optimization="optimizeDisabled" AdditionalIncludeDirectories="DOTDOTS..\..\src\include;DOTDOTSTARGET_HEADER" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" Traceback="true" BoundsCheck="true" RuntimeLibrary="rtSingleThreadedDebug" CompileOnly="true"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/PROJECTNAME.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="DOTDOTS..\..\lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/PROJECTNAME.pdb" SubSystem="subSystemConsole" AdditionalDependencies="fmpich2d.lib mpid.lib"/>
<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="Debug/PROJECTNAME.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="DOTDOTS..\..\lib" GenerateDebugInformation="true" ProgramDatabaseFile="$(OUTDIR)/PROJECTNAME.pdb" SubSystem="subSystemConsole" AdditionalDependencies="fmpich2d.lib mpid.lib"/>
<Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
<Tool Name="VFPreLinkEventTool"/></Configuration>
<Configuration Name="Release|PLATFORM_NAME" DeleteExtensionsOnClean="*.obj;*.mod;*.pdb;*.asm;*.map;*.dyn;*.dpi;*.tmp;*.log;*.ilk;*.exe;$(TargetPath)" MustRebuild="true" Command="$(TargetPath)">
......@@ -18,7 +18,7 @@
<Tool Name="VFFortranCompilerTool" SwitchesHaveChanged="true" SuppressStartupBanner="true" AdditionalIncludeDirectories="DOTDOTS..\..\src\include;DOTDOTSTARGET_HEADER" ModulePath="$(INTDIR)/" ObjectFile="$(INTDIR)/" CompileOnly="true"/>
<Tool Name="VFPostBuildEventTool"/>
<Tool Name="VFCustomBuildTool"/>
<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="$(OUTDIR)/PROJECTNAME.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="DOTDOTS..\..\lib" SubSystem="subSystemConsole" AdditionalDependencies="fmpich2.lib mpi.lib"/>
<Tool Name="VFLinkerTool" SwitchesHaveChanged="true" MustRebuild="true" OutputFile="Release/PROJECTNAME.exe" LinkIncremental="linkIncrementalNo" SuppressStartupBanner="true" AdditionalLibraryDirectories="DOTDOTS..\..\lib" SubSystem="subSystemConsole" AdditionalDependencies="fmpich2.lib mpi.lib"/>
<Tool Name="VFResourceCompilerTool" ResourceOutputFileName="$(IntDir)/$(InputName).res"/>
<Tool Name="VFPreLinkEventTool"/></Configuration></Configurations>
<Files>
......
......@@ -104,7 +104,7 @@ Function RunTests(filename)
if Left(twostrings(0), 1) <> "#" then
if Len(twostrings(1)) > 0 then
exe = Replace( filename, "testlist", config + twostrings(0) + ".exe" )
cmd = "mpiexec -timeout 180 -n " + twostrings(1) + " -channel " + channel_name + " " + exe
cmd = "mpiexec -timeout 900 -n " + twostrings(1) + " -channel " + channel_name + " " + exe
if bEcho = true then
WScript.Echo cmd '+ vbCrLf
end if
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment