[mpich2-commits] r4104 - mpich2/trunk/test/mpi

[jayesh at mcs.anl.gov]

Author: jayesh
Date: 2009-03-17 17:26:52 -0500 (Tue, 17 Mar 2009)
New Revision: 4104

Modified:
   mpich2/trunk/test/mpi/project_f.txt
   mpich2/trunk/test/mpi/runtests.wsf
Log:
Explicitly specifying path to executables in the fortran project template file. This makes it easier for the windows test scripts

Modified: mpich2/trunk/test/mpi/project_f.txt
===================================================================
--- mpich2/trunk/test/mpi/project_f.txt	2009-03-17 22:01:08 UTC (rev 4103)
+++ mpich2/trunk/test/mpi/project_f.txt	2009-03-17 22:26:52 UTC (rev 4104)
@@ -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>

Modified: mpich2/trunk/test/mpi/runtests.wsf
===================================================================
--- mpich2/trunk/test/mpi/runtests.wsf	2009-03-17 22:01:08 UTC (rev 4103)
+++ mpich2/trunk/test/mpi/runtests.wsf	2009-03-17 22:26:52 UTC (rev 4104)
@@ -104,7 +104,7 @@
 			 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