[Compbench-devel] CompBenchmarks++/System System.cpp,1.16,1.17

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/System
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4723

Modified Files:
	System.cpp 
Log Message:
Fixes on patch directory checking.

Index: System.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/System/System.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** System.cpp	4 Jan 2007 18:53:05 -0000	1.16
--- System.cpp	10 Jan 2007 18:04:59 -0000	1.17
***************
*** 38,41 ****
--- 38,53 ----
  }
  
+ int CBMSystem::verifyPatchDirectory(std::string dir)
+ {
+   std::string fn;
+ 
+   if (!checkDirectory(dir)) {
+     return(0);
+   }
+   fn+="/scimark2.patch.gz";
+ 
+   return(fileExists(fn));
+ }
+ 
  int CBMSystem::CheckDirectory(Temp where)
  {
***************
*** 412,418 ****
      result+="/";
      result+="patches";
!     if (!checkDirectory(result)) {
        result=getenv("PWD");
        result+="/share/patches";
      }
      break;
--- 424,434 ----
      result+="/";
      result+="patches";
!     if (!verifyPatchDirectory(result)) {
        result=getenv("PWD");
        result+="/share/patches";
+       if (!verifyPatchDirectory(result)) {
+ 	result=getenv("PWD");
+ 	result+="/../share/patches";
+       }
      }
      break;