[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.13, 1.14 Package.cpp, 1.14, 1.15

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

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv4759

Modified Files:
	Benchmark.cpp Package.cpp 
Log Message:
Closes SF's TID #141701 : SEGFAULTs if choosen compiler's language doesn't not match package's.

Index: Package.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Package.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Package.cpp	6 Jun 2007 15:59:47 -0000	1.14
--- Package.cpp	4 Sep 2007 16:33:32 -0000	1.15
***************
*** 356,362 ****
  
    if (language()!=_currentCompiler->Language()) {
- 
-     storeContext(_currentCompiler,
- 		 _currentOptions);
      info=_currentCompiler->Binary();
      info+=" is a ";
--- 356,359 ----

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Benchmark.cpp	2 Aug 2007 17:06:51 -0000	1.13
--- Benchmark.cpp	4 Sep 2007 16:33:32 -0000	1.14
***************
*** 78,85 ****
  
    if (!p_cm) {
!     Package()->Configure(C, O);
!     Package()->Make(UO_force);
!     r_buildTime=Package()->buildTime();
!     r_test=Package()->Test(UO_force) ? "1" : "0";
    }
  
--- 78,87 ----
  
    if (!p_cm) {
!     if (Package()->Configure(C, O)) {
!       Package()->Make(UO_force);
!       r_buildTime=Package()->buildTime();
!       r_test=Package()->Test(UO_force) ? "1" : "0";
!     } else
!       return(0);
    }